Merge changes I28031a27,If98d7397 into qt-dev am: 6a975c11a2 (fc8251e2) · Commits · e / os / android_frameworks_base

cmds/incidentd/src/Privacy.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ namespace incidentd {

		using namespace android::os;

		static const bool kEncryptionEnabled = false;

		uint64_t encode_field_id(const Privacy* p) { return (uint64_t)p->type << 32 \| p->field_id; }

		const Privacy* lookup(const Privacy* p, uint32_t fieldId) {
		@@ -37,7 +39,9 @@ const Privacy* lookup(const Privacy* p, uint32_t fieldId) {
		return NULL;
		}

		bool sectionEncryption(int section_id) { return section_id == 3025 /restricted image section/; }
		bool sectionEncryption(int section_id) {
		return kEncryptionEnabled ? (section_id == 3025) /restricted image section/ : false;
		}

		static bool isAllowed(const uint8_t policy, const uint8_t check) {
		switch (check) {

+9 −8

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import java.io.PrintWriter;
		import java.text.SimpleDateFormat;
		import java.util.ArrayList;
		import java.util.Date;
		import java.util.Iterator;
		import java.util.List;

		// TODO: User changes should deny everything that's pending.
		@@ -376,11 +377,11 @@ class PendingReports {
		Log.w(TAG, "Can't parse id from: " + uriString);
		return null;
		}
		final int size = mPending.size();
		for (int i = 0; i < size; i++) {
		final PendingReportRec rec = mPending.get(i);

		for (Iterator<PendingReportRec> i = mPending.iterator(); i.hasNext();) {
		final PendingReportRec rec = i.next();
		if (rec.id == id) {
		mPending.remove(i);
		i.remove();
		return rec;
		}
		}
		@@ -391,12 +392,12 @@ class PendingReports {
		* Remove a PendingReportRec keyed by listener.
		*/
		private void removePendingReportRecLocked(IIncidentAuthListener listener) {
		final int size = mPending.size();
		for (int i = 0; i < size; i++) {
		final PendingReportRec rec = mPending.get(i);

		for (Iterator<PendingReportRec> i = mPending.iterator(); i.hasNext();) {
		final PendingReportRec rec = i.next();
		if (rec.listener.asBinder() == listener.asBinder()) {
		Log.i(TAG, " ...Removed PendingReportRec index=" + i + ": " + rec.getUri());
		mPending.remove(i);
		i.remove();
		}
		}
		}