summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2015-09-261-4/+4
| | | | | Change-Id: Ie2eb569fc4b41e3639b81af4d84a52ec564cd662 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2015-09-184-14/+14
| | | | | Change-Id: Ie210e470536721f3d8dbe0f44620e5e7c7bfbb26 Auto-generated-cl: translation import
* am 431be7f8: am c8594ddf: Check for zero length array returnsAlan Newberger2015-07-311-4/+8
|\ | | | | | | | | * commit '431be7f85d9693a05b1a1863d75ea44e7b008754': Check for zero length array returns
| * am c8594ddf: Check for zero length array returnsAlan Newberger2015-07-311-4/+8
| |\ | | | | | | | | | | | | * commit 'c8594ddf504109dc3c17baf9c2448469b28973e9': Check for zero length array returns
| | * Check for zero length array returnsAlan Newberger2015-07-311-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | permissions API may return zero length arrays, check before access. Bug: 22871531 Change-Id: I0ebd5feecb24f03fda0350a9ab42efa25127b3dc
* | | am ef0b96ce: Change MNC codename to just M.Dianne Hackborn2015-07-311-1/+1
|\| | | | | | | | | | | | | | * commit 'ef0b96ce4571805066c1e0865d41272b066e22e6': Change MNC codename to just M.
| * | Change MNC codename to just M.Dianne Hackborn2015-07-291-1/+1
| | | | | | | | | | | | Change-Id: I1a6d7b269e5b7a1630d29e9f406684175d5bdf7d
* | | am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import ↵Geoff Mendal2015-07-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '822b0367d41d46a101f5a7b87094718811976517': Import translations. DO NOT MERGE
| * | am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-290-0/+0
| |\| | | | | | | | | | | | | * commit '51a59c80a1e60f91e446b0b55282204501cf56a7': Import translations. DO NOT MERGE
| | * am a94d0f6f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-290-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit 'a94d0f6f8f74a3d0b24cf31641d036cff59f8579': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-07-291-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib6a5d3ad23b3b1f6490853959ee68c2d667817b0 Auto-generated-cl: translation import
* | | | am ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-290-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'ff24828ed44a1d6c9ca8ba934f5cab4d092a728c': Import translations. DO NOT MERGE
| * | | am 0b9400ac: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-290-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '0b9400ac9bec5db4919c6ec78e89b84a951ddd43': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-291-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibca60d6b4cced483ee7ec106ec45c1fbdd50a02c Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-291-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ied3be971df7df1d1edb6373748666d42a43a76a5 Auto-generated-cl: translation import
* | | | am 5bbf8748: am 30339719: Remove unused ACCOUNTS permissionsAlan Newberger2015-07-241-2/+0
|\| | | | | | | | | | | | | | | | | | | * commit '5bbf8748046e59b5633d42c84ff687fa22405ea5': Remove unused ACCOUNTS permissions
| * | | am 30339719: Remove unused ACCOUNTS permissionsAlan Newberger2015-07-241-2/+0
| |\| | | | | | | | | | | | | | | | | | * commit '30339719b7ff523b1ab8e6c953b269a870c1181c': Remove unused ACCOUNTS permissions
| | * | Remove unused ACCOUNTS permissionsAlan Newberger2015-07-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | BUG=22716720 Change-Id: Id465f3cf55f41d7ebf90e4feecfa38824b66faa4
* | | | am 151f74fc: am 4df3011e: Protect against destroying uncreated valuesAlan Newberger2015-07-241-5/+15
|\| | | | | | | | | | | | | | | | | | | * commit '151f74fca138df5d3c6f83b86e3b6e8d9748a7e3': Protect against destroying uncreated values
| * | | am 4df3011e: Protect against destroying uncreated valuesAlan Newberger2015-07-241-5/+15
| |\| | | | | | | | | | | | | | | | | | * commit '4df3011e2f3680a80ecc89c817ba528b2a578f0f': Protect against destroying uncreated values
| | * | Protect against destroying uncreated valuesAlan Newberger2015-07-241-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Though we attempt to minimize lifecycle impact by exiting onCreate early due to inadequate permissions, we need to protect against touching fields in onDestroy that we did not initialize in onCreate. BUG=22718094 Change-Id: I49adcbbed005c4efa785458aa398e61488cfceb0
* | | | am 1aaec6c0: am ae474d0b: [Haleakala] Change JPEG compression thread ↵Sascha Haeberling2015-07-232-14/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | priority to BACKGROUND - 1. * commit '1aaec6c024f7f2077590ea507fe70900c4889c48': [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
| * | | am ae474d0b: [Haleakala] Change JPEG compression thread priority to ↵Sascha Haeberling2015-07-232-14/+44
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | BACKGROUND - 1. * commit 'ae474d0b2967b3995a4e1e334d6689b0cd9a38c9': [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
| | * | [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.Sascha Haeberling2015-07-222-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 22670310 Change-Id: Ic2ee7e2de141d7df2a316733b465daa354b2d517
* | | | am 2506ff92: am ac0e2425: Fixes to M permissions.zafir2015-07-182-16/+13
|\| | | | | | | | | | | | | | | | | | | * commit '2506ff92df39152e2ea0cb9070fa08db05262e2a': Fixes to M permissions.
| * | | am ac0e2425: Fixes to M permissions.zafir2015-07-182-16/+13
| |\| | | | | | | | | | | | | | | | | | * commit 'ac0e2425e77a9b69e76d2f31876798825ea44584': Fixes to M permissions.
| | * | Fixes to M permissions.zafir2015-07-172-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called PermissionsActivity with startActivityForResult(). However, this creates race conditions as we check for permissions and the CameraActivity continues to operate. Now, we end CameraActivity and launch a new instance upon successful permissions resolution. We can also put the preload filmstrip logic back in its original place in onCreate. The checks for permissions happen in both onCreate and onResume. Bug: 22442745, 22478144, 22497152 Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0
* | | | am e65f51f5: am dd334be9: Camera M permissions: lockscreen improvementszafir2015-07-173-8/+92
|\| | | | | | | | | | | | | | | | | | | * commit 'e65f51f583c1707548662992d85176a8ed9ba19e': Camera M permissions: lockscreen improvements
| * | | am dd334be9: Camera M permissions: lockscreen improvementszafir2015-07-173-8/+92
| |\| | | | | | | | | | | | | | | | | | * commit 'dd334be92c5513a06c809ee3ea25e411dfad0589': Camera M permissions: lockscreen improvements
| | * | Camera M permissions: lockscreen improvementszafir2015-07-173-8/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL now just provides some improvements for lockscreen independent of any onCreate/onResume lifecycle adjustments. Fixes include: * add a black content view to Permissions Activity -- noticed screen junk opening from lockscreen due to unpainted regions, the whole activity needs to paint the screen not just the dialog. * use FLAG_SHOW_WHEN_LOCKED to show permissions screen over lockscreen, per bug discussion in this case force failure, don't prompt for permission grants. * fun double onResumes induce flicker jank in the dialog UI. Inherit QuickActivity to automatically pick up the workarounds for double onResumes from lockscreens, no more flicker in the permission dialog. * also borrow from CameraActivity, broadcast receives to shut down the permissions dialog when screen goes off or user hits home on top of lockscreen. Actually apply this more broadly so that even below lockscreen, we finish this activity on screen off, IMO it is jarring to go in through lockscreen and see our permission dialog again without context of having just opened camera. * tweak permission dialog to not be cancelable, and to finish activity on back button press. * excludeFromRecents on the activity to prevent dual recents for Camera to show up when opening both via SecureCameraActivity and CameraActivity. Bug: 22502696 Change-Id: Ib545d3baa2d83b52604eec5517047b0c6278cd92
* | | | am ede11beb: (-s ours) am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'ede11beb9c3a05dad2628809641c16398e3fbeb0': Import translations. DO NOT MERGE
| * | | am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '34663b0fd4a21a6c107c6df313bcbd1548235fd5': Import translations. DO NOT MERGE
| | * | am 36c35f23: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit '36c35f23f17ecfc47d1e2ef5d36b6516251b9018': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-07-153-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I53f7a9c9bbdcdde5cad99311baab64f6f544d166 Auto-generated-cl: translation import
* | | | am 5449f0fd: (-s ours) am 62f7a266: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '5449f0fdc0fe0eceb106e4d4554cdfe729103f84': Import translations. DO NOT MERGE
| * | | am 62f7a266: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '62f7a266f8862fbec21a97c3a73e74871170296d': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-153-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I6dcf9bc38b2598177be02909f1f856ffc27cc609 Auto-generated-cl: translation import
* | | | am a95faf78: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'a95faf780471afea65bb4e5f2b2570e4d9a4e7b9': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1571-149/+78
| | | | | | | | | | | | | | | | | | | | Change-Id: I11944ad0054d472734152d0021b52eec67e3821a Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1577-84/+84
| | | | | | | | | | | | | | | | | | | | Change-Id: Icc30bb057630e9fde4214259ba5407d99475c3b8 Auto-generated-cl: translation import
* | | | am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import ↵Geoff Mendal2015-07-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '498af6a5693cde49419f3a9abcfeb572d3a461e2': Import translations. DO NOT MERGE
| * | | am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-140-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'ca7f4ce983d0bf25433226eb35f052741339ef12': Import translations. DO NOT MERGE
| | * | am ec5a5213: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-140-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit 'ec5a52136e344305fac60f6053fe4c36aa24ceb8': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-07-1471-144/+73
| | | | | | | | | | | | | | | | | | | | Change-Id: I98a926452e577686aa0fa16232c7e25a6a8ba234 Auto-generated-cl: translation import
* | | | am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-140-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '4e3575eb98e1b60600a9146862ab190491eec035': Import translations. DO NOT MERGE
| * | | am 4c77d6a7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-140-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '4c77d6a70be80db4aac675d6a795708e7f0c57b4': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-1471-148/+85
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic68870870e0b7c0b89c4dad2cecf0981ae6086fc Auto-generated-cl: translation import
* | | | am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR ↵Alan Newberger2015-07-131-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | layout" into ub-camera-haleakala * commit 'cc4f1804cdd1bd41b1531883db25c28a55326f4c': Set ModeListView to LTR layout
| * | | am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ↵Alan Newberger2015-07-131-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | ub-camera-haleakala * commit '6bb610be1aa27864d4049732f330e277623a9381': Set ModeListView to LTR layout
| | * | am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakalaAlan Newberger2015-07-131-0/+1
| | |\| | | | | | | | | | | | | | | | | * commit 'ad510fddb124d1e02fd1e135d672ab1f14923e56': Set ModeListView to LTR layout