OSDN Git Service
Baligh Uddin [Fri, 18 Sep 2015 21:02:31 +0000 (14:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I31f62d18cace1e7b37b900f94e624e9fc1762f2f
Auto-generated-cl: translation import
Adam Powell [Fri, 18 Sep 2015 16:25:30 +0000 (16:25 +0000)]
Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
Shishir Agrawal [Fri, 18 Sep 2015 01:49:58 +0000 (01:49 +0000)]
Merge "Allow non-persistent manual network selection." into mnc-dr-dev
Jorim Jaggi [Fri, 18 Sep 2015 00:41:31 +0000 (00:41 +0000)]
Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev
Jorim Jaggi [Wed, 16 Sep 2015 22:53:42 +0000 (15:53 -0700)]
Start fingerprint authentication in onStartedGoingToSleep
We used to start fingerprint authentication in onFinishedGoingToSleep.
This was a UX issue because then users couldn't place the finger on
the sensor immediately after pressing the power button because
onFinishedGoingToSleep is significantly delayed (around 900ms after
pressing the power button).
Bug:
23570959
Change-Id: I0bf557ebd10e6a8b033ab98a78aa338bf6538dcc
Jorim Jaggi [Wed, 16 Sep 2015 21:53:48 +0000 (14:53 -0700)]
Handle case correctly when screen times out and locking immediately
In case the the screen timed out and the setting was set to "lock now"
in case the screen times out, we locked before finished going to sleep,
leading to all kinds of state messups in Keyguard, including an empty
lockscreen when authenticating with fingerprint during that period.
Bug:
23952388
Change-Id: If1629be1171c841d51ec0555422e6108002fdb73
Zach Riggle [Thu, 17 Sep 2015 22:33:34 +0000 (22:33 +0000)]
am
ad0acf1d: am
9836b64f: am
f68b1953: am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
ad0acf1d104988238f431d874f0ecf9917a06699':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 22:25:53 +0000 (22:25 +0000)]
am
9836b64f: am
f68b1953: am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
9836b64f529238d1219f1937abf481383cd0cacd':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 22:17:11 +0000 (22:17 +0000)]
am
f68b1953: am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
f68b1953259a13562f5a2331526edafae5c1d99f':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 22:00:29 +0000 (22:00 +0000)]
am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
683cd049f7c762251567a0e0386ee49bb1428351':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 21:34:08 +0000 (17:34 -0400)]
resolved conflicts for
521def98 to lmp-mr1-dev
Adam Powell [Thu, 17 Sep 2015 20:38:16 +0000 (13:38 -0700)]
Badge ChooserActivity choices with their app icon for disambig
When two or more activities with the same user-visible label are
shown, we have traditionally shown the app name or package name if the
app names also match. This was to help the user tell the difference
between multiple apps publishing similar activities and avoid
unintentionally starting the wrong one. However, in the case of
explicit choosers (e.g. ACTION_SEND sharing) a few common collisions
occur in practice and falling all the way back to package name isn't
very helpful.
Instead, we now assume that the app icon, which the user has seen
before at install time, is unique enough on its own to disambiguate
these cases and avoid user confusion. We no longer show the app name
or package name as secondary text in the chooser.
In cases where an activity has a different icon from its containing
app, we now badge the activity icon with the app icon so that the user
knows which app a potentially ambiguous choice belongs to.
Bug
24113937
Change-Id: Ie54fbf77bfcc86e50768f93be2be0e53cf2ce7b5
Tim Murray [Thu, 17 Sep 2015 02:24:32 +0000 (02:24 +0000)]
Merge "Send power hint on fling gestures." into mnc-dr-dev
Michael Wright [Wed, 16 Sep 2015 22:19:26 +0000 (23:19 +0100)]
Send power hint on fling gestures.
Use the existing PointerEventListener infrastructure to listen for
gestures that look like flings and hint to the power system when they
happen. Since we don't actually have a bound for the fling like a
regular application would, limit them to five seconds and refresh
every time a new fling is seen until the five second time period is
up.
bug
24059298
Change-Id: I5757a1e88f2ab2ef08cccefa8221d809ae71bb6f
Jorim Jaggi [Thu, 10 Sep 2015 22:48:21 +0000 (15:48 -0700)]
Allow camera launch also when device is interactive
Bug:
23967648
Change-Id: If91df75e6325b3969dc2351a70af0c160d3eab04
Adam Powell [Wed, 9 Sep 2015 00:01:49 +0000 (17:01 -0700)]
Handle single-choice ChooserActivities and bound ChooserTargetServices
Fix cases where we could try to unbind from a ChooserTargetService
that is not connected. This could happen if we still had stale replies
coming back after the activity was destroyed.
Always offer users an explicit choice in ChooserActivity, don't
auto-start a single option.
Make sure we don't allow a wedged ChooserTargetService to hold a hard
reference to the ChooserActivity via its internal result callback.
Bug
23152483
Change-Id: I7c8b1fc9559dcd477702ef582011b088b07d646b
(cherry picked from commit
9761ab2a645a4643bd20619c7c148ef07e0dd39d)
Fyodor Kupolov [Wed, 16 Sep 2015 19:37:47 +0000 (19:37 +0000)]
Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
Jack Yu [Wed, 16 Sep 2015 19:15:49 +0000 (19:15 +0000)]
Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev
Chris Tate [Wed, 16 Sep 2015 17:05:07 +0000 (17:05 +0000)]
Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
Andres Morales [Wed, 16 Sep 2015 16:04:56 +0000 (16:04 +0000)]
Merge "reset lockout deadline on device reboot" into mnc-dr-dev
Zach Jang [Wed, 16 Sep 2015 02:16:04 +0000 (02:16 +0000)]
am
716c6269: am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
716c6269674474867dc4720f86f739c639c83400':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:16:00 +0000 (02:16 +0000)]
am
971ff47c: am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
971ff47c75889a2fc4ac710fbe62ba819feeaba6':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 02:06:31 +0000 (02:06 +0000)]
am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
63348ae4572cd9394e79fe343d2fca2b38498d1c':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:06:26 +0000 (02:06 +0000)]
am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
1b06455e44395489dcd027a170e68eabf2ebe1da':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:56:57 +0000 (01:56 +0000)]
am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
11317e82cf561597bbd4e2dbf5840854e6b7a16d':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:56:52 +0000 (01:56 +0000)]
am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
00db0826561b23a54db28ed5203fd7eff79c16c7':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:44:58 +0000 (01:44 +0000)]
am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
32a420ea36fbae07484f6fcf718ed97865ca3158':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:44:53 +0000 (01:44 +0000)]
am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
203b43547da94c9fb78931680b99f9db49fc46c9':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:40:18 +0000 (01:40 +0000)]
Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
Zach Jang [Wed, 16 Sep 2015 01:38:41 +0000 (01:38 +0000)]
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
This reverts commit
3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.
Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
Zach Jang [Wed, 16 Sep 2015 01:37:36 +0000 (01:37 +0000)]
Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
Lorenzo Colitti [Wed, 16 Sep 2015 00:54:57 +0000 (00:54 +0000)]
Merge "Framework fixes for RSSI offload." into mnc-dr-dev
Christopher Tate [Tue, 15 Sep 2015 21:26:12 +0000 (14:26 -0700)]
Do not back up/restore the "pulse LED for notifications" setting
Bug
24103790
Change-Id: I69a6a85e5282f9ca50fc2655bda4695757b92e74
Jim Miller [Tue, 15 Sep 2015 21:08:06 +0000 (21:08 +0000)]
Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
Guang Zhu [Mon, 14 Sep 2015 01:43:56 +0000 (18:43 -0700)]
extend svc command to control NFC state
Change-Id: I599e4000fa17384089410e63b3150f25aa9458f7
Svet Ganov [Tue, 15 Sep 2015 20:10:30 +0000 (20:10 +0000)]
am
cd946024: Default grant SMS and Phone to the verifier
* commit '
cd946024e94a8fe2f4009dbd2e5463817a17b3a9':
Default grant SMS and Phone to the verifier
Zach Jang [Tue, 15 Sep 2015 20:09:52 +0000 (20:09 +0000)]
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
This reverts commit
82b70db7dd906013d131737a5bec2ae59b41ae61.
Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
Lorenzo Colitti [Tue, 15 Sep 2015 06:56:01 +0000 (15:56 +0900)]
Framework fixes for RSSI offload.
1. When registering a NetworkCallback, only update RSSI
thresholds if the request specifies a signal strength.
2. When releasing a NetworkCallback, only update RSSI
thresholds if the request specified a signal strength.
3. Add logging.
Add logging.
Bug:
21405941
Bug:
23679346
Bug:
23815756
Change-Id: I4bc42d0ab02285a7a9d14e09f8a1cd868f4d9d7f
Lorenzo Colitti [Tue, 15 Sep 2015 02:39:20 +0000 (02:39 +0000)]
Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
Jim Miller [Tue, 15 Sep 2015 01:58:08 +0000 (18:58 -0700)]
Add logging to track fingerprint reco but not unlocking
Bug
23940153
Change-Id: Idb01802ba68449370e8f3cbede0e2fe6d0b977ce
Jack Yu [Mon, 14 Sep 2015 23:18:59 +0000 (16:18 -0700)]
Added a carrier config key for emergency messages on/off option always showing.
Adding a carrier config key that allows carriers to show "Turn on Notifications"
checkbox in Settings->More->Emergency broadcasts setting menu. If this key
exists and is set to true, this checkbox will always show up regardless of
developer options turned on or not.
bug:
23886750
Change-Id: I54dec5830653a0e27d7ee652effe572231f1e3bb
Adrian Roos [Mon, 14 Sep 2015 18:47:59 +0000 (18:47 +0000)]
Merge "Fix light status bar transitions" into mnc-dr-dev
Chris Manton [Mon, 14 Sep 2015 17:23:42 +0000 (17:23 +0000)]
Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
Svet Ganov [Sat, 12 Sep 2015 17:19:54 +0000 (10:19 -0700)]
Default grant SMS and Phone to the verifier
bug:
24012164
Change-Id: I756644c8044076b2550d7ca104f542f50da0226b
Michael Wright [Sat, 12 Sep 2015 06:29:09 +0000 (06:29 +0000)]
am
4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
* commit '
4c330c6ae53df48f6486b6f047021b204fc66594':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Jorim Jaggi [Sat, 12 Sep 2015 00:45:22 +0000 (17:45 -0700)]
Dump Keyguard state in SystemUI and PhoneWindowManager
Bug:
23970549
Change-Id: Iec1e8ac507268086e0e2935847eda606ea1fb700
Adrian Roos [Fri, 11 Sep 2015 19:38:43 +0000 (12:38 -0700)]
Fix light status bar transitions
Bug:
23971926
Change-Id: Ia3c6fb18d38fb7479028191ad3df8389adb830ec
Chris Manton [Tue, 1 Sep 2015 20:56:46 +0000 (13:56 -0700)]
Add capability to ignore carrier entitlement checks
Boolean to check to ignore carrier entitlement check.
API to follow later.
Carrier configuration manager has an option
to override tethering entitlement checks.
Ignore entitlement checks if overridden by
the carrier configuration flag.
bug:
23712807
Change-Id: I6c9b3b9994279e592db304debef54809338fe9cf
Alan Viverette [Fri, 11 Sep 2015 21:28:59 +0000 (21:28 +0000)]
Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
Tyler Gunn [Fri, 11 Sep 2015 15:37:40 +0000 (15:37 +0000)]
Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev
Roshan Pius [Fri, 11 Sep 2015 06:13:12 +0000 (06:13 +0000)]
Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
Jorim Jaggi [Thu, 10 Sep 2015 21:36:19 +0000 (14:36 -0700)]
Listen for fingerprint when on bouncer
To make unlocking work if keyguard is in occluded state and user
taps on a notification.
Bug:
22855718
Change-Id: Ide632f524a635e3e37741abaa77e258394c9a6e2
Jorim Jaggi [Mon, 24 Aug 2015 20:54:19 +0000 (13:54 -0700)]
Don't wait for brightness changes
On some devices, changing the brightness is quite slow, because the
change needs to wait for the vsync signal. However, when we are also
running a brightness change animation, as soon as the last change has
been sent there is a new one pending, leading to that we never reach
"clean" state in the PowerManagerService and thus we don't notify
clients about the state change, which can delay the animation for waking
up while dozing by as much as a second.
To fix this, if we only issue a brightness change, we don't block on
that because it's not relevant for us.
Bug:
22879546
Change-Id: Idad7e90c436bfbc38581fe8ce24d606e432b7952
Svetoslav [Fri, 11 Sep 2015 00:23:08 +0000 (00:23 +0000)]
am
5579e41c: Add op package to the UID special case handling in account manager.
* commit '
5579e41c6f81bba1fc1e8cc53186957e287b5dad':
Add op package to the UID special case handling in account manager.
Amit Mahajan [Thu, 10 Sep 2015 23:22:37 +0000 (23:22 +0000)]
Merge "Add to configure for MDC_INITIAL_MAX_RETRY" into mnc-dr-dev
Sungmin Choi [Thu, 10 Sep 2015 18:25:02 +0000 (11:25 -0700)]
Add to configure for MDC_INITIAL_MAX_RETRY
Bug:
23804201
Change-Id: I63fbc168c05792635b7919e81d7397741ffb416b
Svetoslav [Thu, 10 Sep 2015 22:30:45 +0000 (15:30 -0700)]
Add op package to the UID special case handling in account manager.
The account manager has a hardcoded rule to change the calling
UID if the caller is the system and another UID is passed in.
We have to do the same acrobatics for the app op package as if
the UID changes the opPackageName will not match the new UID.
If we used the passed in UID we should also use the passed in
op package name.
bug:
23968092
Change-Id: I0c0c2a720e9edbf82001952929d990702f8650ca
Shishir Agrawal [Thu, 10 Sep 2015 21:42:08 +0000 (14:42 -0700)]
Allow non-persistent manual network selection.
Allow the API to specify if the selection should be persisted across reboots.
This also has the side affect of not notifying the user when signal is lost.
Necessary becasue the API might be used transparent to the user and the
notifications will be bizarre.
Bug:
23971948
Change-Id: Ibb15144fb8a61f63a9c967d875d9ce8c70520ff0
Martijn Coenen [Thu, 10 Sep 2015 21:17:56 +0000 (21:17 +0000)]
Merge "Fix missing copyright headers." into mnc-dr-dev
Tyler Gunn [Thu, 10 Sep 2015 20:33:28 +0000 (13:33 -0700)]
Add carrier config for characters to escape with backslash.
Bug:
22779583
Change-Id: I21ab2c9a4f15bcf96c5b978e7cac4638db259087
Fyodor Kupolov [Wed, 9 Sep 2015 22:56:45 +0000 (15:56 -0700)]
Use app directory as apkPath for cluster installs
Previously, size of of oat directory was not counted by the getsize command,
because base APK location was passed as apkpath argument.
Bug:
23896047
Change-Id: Ic7b6b725785ff2e2a0cf3887ba68c162b23b1212
Roshan Pius [Thu, 10 Sep 2015 17:28:06 +0000 (10:28 -0700)]
Add a new carrier config for DTMF tone gap.
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network.
This is the same fix as ag/747865 ported for GSM connections.
BUG:
23064351
Change-Id: I4163323378e380ac187493fa91694721269124b9
Alan Viverette [Thu, 10 Sep 2015 15:10:41 +0000 (11:10 -0400)]
Avoid OOBE when AbsListView layout is out of sync with adapter
Views are not synchronized with adapter state until a layout pass
occurs, which may cause an OOBE if a list item is removed and an
accessibility node is obtained before the next layout pass.
This CL caches the item's enabled state on the bound view's layout
params, which allows us to avoid relying on the adapter to populate
accessibility nodes. It also aborts actions if the target position
is no longer valid.
Updates the documentation on AdapterView to reflect that the result
of getPositionForView() may not be synchronized with the adapter.
Bug:
23943664
Change-Id: I90ca946bead1d87a179eab1c2f482a54bcce9c38
Lorenzo Colitti [Wed, 9 Sep 2015 08:37:12 +0000 (17:37 +0900)]
NetworkDiagnostics: ping default router from all global addreses.
This will hopefully allow us to determine if the router does not
have our global addresses in its neighbour cache.
Bug:
23661687
Change-Id: I46734c3c719003939cfccf038457ec309a9ff967
Amit Mahajan [Thu, 10 Sep 2015 00:55:15 +0000 (00:55 +0000)]
Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev
Daniel Sandler [Thu, 10 Sep 2015 00:53:14 +0000 (00:53 +0000)]
Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev
Sungmin Choi [Tue, 8 Sep 2015 22:34:23 +0000 (15:34 -0700)]
Add carrier config variable to hide preferred network type
Bug:
23862319
Change-Id: I99403f358f0b53f366083edafc3762f5679b0b45
Jorim Jaggi [Thu, 10 Sep 2015 00:25:59 +0000 (00:25 +0000)]
Merge "Add double-tap power button to open camera 1/2" into mnc-dr-dev
Jeff Sharkey [Thu, 10 Sep 2015 00:18:43 +0000 (00:18 +0000)]
Merge "Special interval value to always run benchmarks." into mnc-dr-dev
Jorim Jaggi [Wed, 9 Sep 2015 23:29:17 +0000 (23:29 +0000)]
Revert "Disable fingerprint after force lock"
Bug:
23827042
This reverts commit
0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7.
Change-Id: I40251500b2dcf95e63ce39a768e11a50b26fb923
Adrian Roos [Thu, 3 Sep 2015 22:59:49 +0000 (15:59 -0700)]
Add double-tap power button to open camera 1/2
Bug:
23787555
Change-Id: I052b64748f155c59fbb649b32265f559423a8845
Jeff Sharkey [Wed, 9 Sep 2015 21:53:38 +0000 (14:53 -0700)]
Special interval value to always run benchmarks.
When interval is set of 0, always run benchmarks after every fstrim
pass, which is roughly daily. We don't actually track the last
benchmark time for internal storage, so this is the best way we have
to enable this.
Also disable benchmarking completely when interval is set to -1.
Bug:
23942769
Change-Id: I11edfda063aac6e927c6cce56567169ebe83cb71
Andres Morales [Tue, 8 Sep 2015 20:17:37 +0000 (13:17 -0700)]
reset lockout deadline on device reboot
Gatekeeper retains lockouts after reboot, but framework
doesn't. This causes odd behavior on a reboot after a lockout
as gatekeeper refuses to check the password and the framework
thinks it's an invalid attempt. Reset the lockout deadline
if we notice the clock reset in the framework.
Bug:
23681267
Change-Id: I3127ccd8f205494af5a8ed2b44d4370c37cc2f8f
Selim Cinek [Wed, 9 Sep 2015 22:07:02 +0000 (22:07 +0000)]
Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev
Jorim Jaggi [Fri, 4 Sep 2015 21:17:58 +0000 (14:17 -0700)]
Use AlarmManager for lockout reset
So the lockout reset exactly fires after 30 seconds, independent
of whether the device was in deep sleep.
Bug:
23668918
Change-Id: Idea1a877c395897c1fd075cf98edf41c8b1f4082
Vineeta Srivastava [Wed, 9 Sep 2015 17:12:39 +0000 (17:12 +0000)]
Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
Tyler Gunn [Wed, 9 Sep 2015 16:09:33 +0000 (16:09 +0000)]
Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
Svetoslav Ganov [Wed, 9 Sep 2015 01:42:56 +0000 (01:42 +0000)]
am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
4f7d0bc7af5fbb65796d24b130b7e9e63107bc5d':
Add get_accounts app op
Svetoslav Ganov [Wed, 9 Sep 2015 01:36:58 +0000 (01:36 +0000)]
Merge "Add get_accounts app op" into mnc-dev
Selim Cinek [Thu, 3 Sep 2015 23:01:53 +0000 (16:01 -0700)]
Fixed a racecondition where the camera would not launch
If the gesture was detected while turning on, the gesture
would not launch.
Bug:
23636271
Change-Id: I166759a55137163be0c3f38fe8d1dc0c18977e11
Svetoslav [Tue, 8 Sep 2015 21:36:35 +0000 (14:36 -0700)]
Add get_accounts app op
For each runtime permission we have an app op to toggle the
permission for legacy apps as they cannot handle permission
revocations. We were lacking an app op for get_accounts
which prevented the user from controlling access to accounts
regardelss that they change the state of the permission
toggle in the UI. Even worse the permission UI is written
with the assumption that every runtime permission has an
app op and as a result revoking the contacts group (if the
app requests the get_accounts permission) is reset back to
allowed in the UI.
bug:
23854618
Change-Id: I9e3f9bfeb320bed561d718db99ee285915d5701b
Zhentao Sun [Wed, 9 Sep 2015 00:29:03 +0000 (00:29 +0000)]
Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
Sungmin Choi [Mon, 31 Aug 2015 22:32:20 +0000 (15:32 -0700)]
Add carrier config variable to hide ims apn
Bug:
23770219
Change-Id: I691d2594384196852d7128a9b4969ba9a861205c
Lorenzo Colitti [Wed, 9 Sep 2015 00:18:39 +0000 (00:18 +0000)]
Merge changes from topic 'packet-keepalive-fixes' into mnc-dr-dev
* changes:
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Add an error code for generic hardware error.
Fix bugs and crashes in PacketKeepalive API.
Add tests for the PacketKeepalive API.
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
Get rid of shortSleep() in ConnectivityServiceTest.
Make ConnectivityServiceTest a bit more readable.
Jorim Jaggi [Fri, 4 Sep 2015 02:58:19 +0000 (19:58 -0700)]
Cancel animation when hiding Keyguard
So we don't end up in a wrong state.
Bug:
23692022
Change-Id: If40eb66499c95b82d86873dbbd6ccc64468373b2
Selim Cinek [Wed, 2 Sep 2015 01:05:08 +0000 (18:05 -0700)]
Removed the secure camera launcher
With Android M, the system correctly handles camera arbitration
and therefore the secure camera launcher was only adding delay.
Bug:
23713450
Change-Id: Icd5e7883f3560bfd0c9b5f7bd93675847949469b
Zhentao Sun [Tue, 8 Sep 2015 22:41:25 +0000 (15:41 -0700)]
Changed the vibration duration from 1s to 750ms.
Fixed b/
23727634.
Change-Id: Ie03b26f7b8faee8d61d772041351729995f7088c
Android Git Automerger [Tue, 8 Sep 2015 21:55:50 +0000 (21:55 +0000)]
am
92aeac34: am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
92aeac3499e91985a266590aff88b06a9633b667':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 21:55:46 +0000 (21:55 +0000)]
am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
2c31a0d774cebb9603d3dd7f904af20dce4f3bd4':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Android Git Automerger [Tue, 8 Sep 2015 21:46:08 +0000 (21:46 +0000)]
am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
1c88f605629a5f1647a8af1fdcfe0fb6e3eea847':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 21:46:02 +0000 (21:46 +0000)]
am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
9e28efe4e79402e1ae9c92579d4ea2bc5b4bb664':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Android Git Automerger [Tue, 8 Sep 2015 21:37:33 +0000 (21:37 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
b/
22822607
Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
Cheryl Potter [Tue, 8 Sep 2015 21:36:35 +0000 (21:36 +0000)]
am
4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs
* commit '
4b32b3f43fe8e27ffdb19d51364ebd99a3503e79':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 21:28:06 +0000 (21:28 +0000)]
Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs
xin He [Tue, 8 Sep 2015 21:01:49 +0000 (21:01 +0000)]
Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
Jorim Jaggi [Fri, 4 Sep 2015 18:51:26 +0000 (11:51 -0700)]
Do not expand notifications with expand gesture when disallowed
Bug:
23596083
Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
b/
22822607
Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
Lorenzo Colitti [Tue, 8 Sep 2015 13:02:37 +0000 (22:02 +0900)]
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Bug:
23884210
Change-Id: I50a1a647a69deaba92e73021ee7d6cc0f3eb1eee
Lorenzo Colitti [Tue, 8 Sep 2015 07:46:36 +0000 (16:46 +0900)]
Add an error code for generic hardware error.
This is necessary because currently the wifi code just returns
whatever hardware-specific integer it gets back from the HAL,
which is bad because that will be interpreted by the caller as
one of the error codes defined in this class.
In parallel we'll also modify the wifi code to return this new
error code if the hardware returns an error.
Bug:
21405946
Change-Id: Ic9fa1193ced69a4e7ff543e397221c89b10a5a13