Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
d2b21047c8 Add a separate read permission for oem unlock state 
New privileged permission READ_OEM_UNLOCK_STATE added
for system privileged apps.

Changing the unlock state still requires the old
permission OEM_UNLOCK_STATE, which is signature protected.

Bug: 28953956
Change-Id: Iedd2ad1d2d1dc3ae91122d7c406e3ee623a47d61
 2016-06-03 14:33:26 -07:00
songjinshi
b9d266ff9b Merge "Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService." 
am: 7211131e23

* commit '7211131e238920db03c83f0c2c21f3c135a7e44f':
  Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.

Change-Id: Ifd70b0232fba8d1c8fe2e87b2ca95985d3c0681c
 2016-06-03 21:32:03 +00:00
Robert Carr
0409211e7f Ensure pinned animation scaling is consistently applied. 
For the pinned stack animation, we have the special mode
where setSurfaceBoundaries computes additional scaling
factors to force the window to occupy the stack size
(which we animate). We need to make sure prepareSurfaceLocked
also respects these scaling factors or we have issues when
switching in and out of the fullscreen stack.

Bug: 28899837
Change-Id: I72ccba54b38993693ff6771882fb99ef82af5827
 2016-06-03 14:31:58 -07:00
Treehugger Robot
7211131e23 Merge "Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService." 2016-06-03 21:28:34 +00:00
Selim Cinek
f7b21e1db0 Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev 
am: 6c94972622

* commit '6c94972622a5fa6c2f0beb16f190015e81584013':
  Fixed a bug where talkback couldn't scroll through notifications

Change-Id: I66de0c19d02ef87cdb183c1d3f55ca7f6451cab8
 2016-06-03 20:51:49 +00:00
Fyodor Kupolov
93f4735f2f Merge "Delete account from DE and CE databases" into nyc-dev 
am: a087d7f4fa

* commit 'a087d7f4fa6de262aef346acb336fcb826d05d23':
  Delete account from DE and CE databases

Change-Id: Ied3a5d614b814be094df50317db494f60b5a4727
 2016-06-03 20:40:21 +00:00
Selim Cinek
6c94972622 Merge "Fixed a bug where talkback couldn't scroll through notifications" into nyc-dev 2016-06-03 20:39:25 +00:00
Billy Lamberta
422679c891 Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev 
am: c0b602c441

* commit 'c0b602c441337f9597959a02262de525b1793a94':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I530258e6dca8b185f844c626fa7bf1e7f6fbd42d
 2016-06-03 20:36:26 +00:00
Andrew Solovay
16918804a2 Merge "docs: Update N release notes for DP4" into nyc-dev 
am: e20c1e96fc

* commit 'e20c1e96fc0bb85ad5fe52ec1734c2563886dab0':
  docs: Update N release notes for DP4

Change-Id: I98913abb1a13fb9fa1f1b2139fd9fa43e4add25c
 2016-06-03 20:30:30 +00:00
Todd Kennedy
d2568ccdcc Merge "New prebuilt" into nyc-dev 
am: 93b34141b1

* commit '93b34141b1de89a8f176884c3ceb7bc968b252d0':
  New prebuilt

Change-Id: I677b6b38ff15f6c2e012c9c17780d2a060c3d86e
 2016-06-03 20:06:47 +00:00
TreeHugger Robot
a087d7f4fa Merge "Delete account from DE and CE databases" into nyc-dev 2016-06-03 20:00:27 +00:00
Michael Wright
36481749e6 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev 
am: 44b24c9b38

* commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc':
  Revert "Revert "Finalize resource IDs for N.""

Change-Id: Ie8327dac7fbecebe98ce9f7cc9c3d29d818b23f6
 2016-06-03 19:27:36 +00:00
Selim Cinek
38d429f439 Handled expandability and swiping while guts are exposed 
Also fixed a bug where the wrong guts were selected with groups.

Change-Id: I3677ce549b2a90e2dc225470cff4e2548ddca81a
Fixes: 29046865
 2016-06-03 12:12:04 -07:00
Android Build Merger (Role)
c0b602c441 Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev 2016-06-03 18:57:25 +00:00
Billy Lamberta
73e0557ecd docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 
am: 90ee70e519

* commit '90ee70e51927a1cd764bb523f419252547739803':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I19728a3809efb6c3341fa75678625ad0d617d4d5
 2016-06-03 18:56:53 +00:00
Chong Zhang
6f9ae4ffc5 Use getActivityToken() instead of mToken in isTopOfTask 
mToken could be local tokan and causes IllegalArgumentException.

bug: 29072444
Change-Id: I0f889a70a848ffea31663ed80337e1605c75223e
 2016-06-03 11:50:44 -07:00
TreeHugger Robot
e20c1e96fc Merge "docs: Update N release notes for DP4" into nyc-dev 2016-06-03 18:48:57 +00:00
Billy Lamberta
90ee70e519 docs: Fix code sample in /work: Set up Single-Purpose Devices 
am: f4973c28a5

* commit 'f4973c28a513b117bed6f3b7f5e2ffbd975d4f02':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I2e2f851ddf9208d3a734913369e8ece1fe199cfe
 2016-06-03 18:32:42 +00:00
Pavlin Radoslavov
950abbd075 resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp 
Change-Id: I93f0fc1c427b02b0c864901f0a55e4cfaba35032
 2016-06-03 11:12:17 -07:00
Billy Lamberta
f4973c28a5 docs: Fix code sample in /work: Set up Single-Purpose Devices 
bug: 29095115
Change-Id: I7af38925ce24124d0b48368d9a0436b2d60995b5
 2016-06-03 11:08:23 -07:00
Wang Xiaolei
93b34141b1 Merge "New prebuilt" into nyc-dev 2016-06-03 18:08:21 +00:00
Wang Xiaolei
44b24c9b38 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev 2016-06-03 18:08:21 +00:00
Fyodor Kupolov
627fc2021d Delete account from DE and CE databases 
When authenticator no longer exists and the user is unlocked, we should
remove accounts from both tables in a single transaction.

Bug: 28910995
Change-Id: Ibabf5d3e5ba561ffb3dda03aef99e358e2f71c58
 2016-06-03 11:03:03 -07:00
Bill Yi
cc44ccf2f9 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 10e29e0730  -s ours

* commit '10e29e0730c21cb8a2cfe74b43792fa3a5705195':
  Import translations. DO NOT MERGE

Change-Id: Ic4105391ce9541d9073b45d7c5d69b4e2f2bcae5
 2016-06-03 17:59:12 +00:00
Bill Yi
6c4a3962e7 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 93bc210b3f  -s ours

* commit '93bc210b3f9e9a86074080324162b3a66cac104c':
  Import translations. DO NOT MERGE

Change-Id: Ia8b0a47a38207e1d2c85f97f0e771281512d1e9c
 2016-06-03 17:59:06 +00:00
Eino-Ville Talvala
564dc9d0f7 Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 
am: cd44a32dfe

* commit 'cd44a32dfe6a5a39db496af6de7764e164cda6f5':
  Camera2: Update lensShadingMap documentation

Change-Id: If6a354fb827e650e97be7023ba9e44058a415b63
 2016-06-03 17:57:30 +00:00
TreeHugger Robot
10e29e0730 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:54:21 +00:00
TreeHugger Robot
93bc210b3f Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:53:28 +00:00
Paul Jensen
0808eb8069 Include network name in validation logs for dumpsys 
Previously this was included in the log messages from NetworkMonitor
but that has been removed (ag/944107), making it frequently impossible
to know what network the logs apply to as there may be no way to
correlate NetIDs to WiFi SSIDs or Cellular networks if the log has wrapped.

Bug: 26075613
Change-Id: I2e3cd41fffb616ab9f855cb16790360bd3414793
 2016-06-03 13:51:21 -04:00
Eino-Ville Talvala
cd44a32dfe Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 2016-06-03 17:51:19 +00:00
Sanket Agarwal
9eb774054e Merge "While turning OFF do not honor ON requests." 
am: 104518e4c4

* commit '104518e4c430e6e9a6bad44b9f18086d3c6f60fe':
  While turning OFF do not honor ON requests.

Change-Id: I7ca5d9592444d5a6ed4fd4dc635d871c60ba8ec0
 2016-06-03 17:50:15 +00:00
Treehugger Robot
104518e4c4 Merge "While turning OFF do not honor ON requests." 2016-06-03 17:42:38 +00:00
Todd Kennedy
51e458ebd0 New prebuilt 
Need to target API 24 and not 'N'. Also made a small change to the docs

Bug: 29116156
Change-Id: I21c37aa04a4471ca6b3f7727e470129a78f92cf0
 2016-06-03 10:16:12 -07:00
Sudheer Shanka
8ebc6e80b8 Merge "Avoid triggering support dialog in non-current user." into nyc-dev 
am: 5548733eb5

* commit '5548733eb5163ef9f3c642314d2d217503c90d64':
  Avoid triggering support dialog in non-current user.

Change-Id: I243f2699a5840294e0de9efc5e95011fd83dca37
 2016-06-03 17:13:03 +00:00
Bill Yi
81a108d038 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 237b52f40c  -s ours

* commit '237b52f40c5564a54a1073df6e77f6da93cdab12':
  Import translations. DO NOT MERGE

Change-Id: I6155b21e15e89da4d6a5234a89b7dac3ac005099
 2016-06-03 17:12:46 +00:00
Bill Yi
498f780f42 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 31cd8615b2  -s ours

* commit '31cd8615b2cd7cf04e00a87c7981264c1b180356':
  Import translations. DO NOT MERGE

Change-Id: I90116fb8e02a06ab13cb9c7169371f931fdea508
 2016-06-03 17:12:42 +00:00
Bill Yi
7d627e9cf0 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 52edfafb9c  -s ours

* commit '52edfafb9c53d14a5e1de1ecdd3d5b735cecf711':
  Import translations. DO NOT MERGE

Change-Id: I4ef01eea310877c5201b9c2e44c9f49948aeb1f1
 2016-06-03 17:12:38 +00:00
Bill Yi
c29b39b95f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f79616b427  -s ours

* commit 'f79616b4277f477985f96f8a486126a389905c7d':
  Import translations. DO NOT MERGE

Change-Id: Ia6869ed50d88aea53c3c42e02337eaecf1dd870f
 2016-06-03 17:12:33 +00:00
Bill Yi
5c2575071e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: a68d1f10e2  -s ours

* commit 'a68d1f10e2c20e128215406b4d6f4fb835481324':
  Import translations. DO NOT MERGE

Change-Id: Ic08e6e8dcb28ab89c072abe20633c71d7695277e
 2016-06-03 17:04:14 +00:00
Bill Yi
bcd2ea35c0 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2130b28754  -s ours

* commit '2130b287549b010b405bc72d04f07fb1bd070ba5':
  Import translations. DO NOT MERGE

Change-Id: Ib9e163aa0e74fdd6c9b22c292e9651d153e117a4
 2016-06-03 17:04:08 +00:00
Bill Yi
f089201e2e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: ef2989920d  -s ours

* commit 'ef2989920d00f19d5dcd86bd521eec86bc058754':
  Import translations. DO NOT MERGE

Change-Id: I4c4da499fab8a30733235849a336876442e46125
 2016-06-03 17:04:02 +00:00
Bill Yi
67ae5a2251 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 3d9d9fa0d9  -s ours

* commit '3d9d9fa0d97974fc2dbd65ed1bd5b0995b3c347a':
  Import translations. DO NOT MERGE

Change-Id: I02a8d1407296ab018dab851a235fce0c8c75013c
 2016-06-03 17:03:59 +00:00
Bill Yi
479f70c516 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cace07e727  -s ours

* commit 'cace07e7271723232277e8dfe94799c80926c5ea':
  Import translations. DO NOT MERGE

Change-Id: I7b6473f40f64a17b4f7417cf28c1e24d36a9c3ff
 2016-06-03 17:03:50 +00:00
TreeHugger Robot
5548733eb5 Merge "Avoid triggering support dialog in non-current user." into nyc-dev 2016-06-03 17:02:53 +00:00
TreeHugger Robot
237b52f40c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:00:23 +00:00
TreeHugger Robot
31cd8615b2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:58:51 +00:00
TreeHugger Robot
52edfafb9c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:58:27 +00:00
TreeHugger Robot
f79616b427 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:57:50 +00:00
TreeHugger Robot
a68d1f10e2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:56:16 +00:00
TreeHugger Robot
2130b28754 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:55:58 +00:00