Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Sharkey
9351225839 Fix build after merge. 
Change-Id: Iccb1c5a12d453d70eea7e1e3d64d97bc75987bef
 2016-06-03 14:34:16 -06: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
Aurimas Liutikas
f82032fcf9 Fix a link to CustomTabsCallback in support-library docs. 
Bug:
https://code.google.com/p/android/issues/detail?id=183077

Change-Id: I86d1d8e07e42e9e295364b002e7e1534d4d9d5cc
 2016-06-03 13:25:38 -07:00
Christopher Wiley
f1315c3cd6 Tethering: Own WiFi tethering state and lifetime 
- Add logic to Tethering to track whether the user has requested
  tethering via WiFi.
- Subscribe to intents regarding soft AP state to enable and
  disable tethering when the AP comes up or goes down.
- Refactor IP configuration logic to do configuration for WiFi
  as well as USB.

Bug: 29054780
Test: WiFi tethering continues to work on angler
      Tethering related unittests continue to pass.

Change-Id: I6eff2573ca3fd11fabcf138c468ba517ff2daf65
 2016-06-03 13:25:09 -07:00
Aurimas Liutikas
6b1853008e Fix code example in testing-support-library. 
Note: mDevice is a variable, there is additional brackets.

Bug:
https://code.google.com/p/android/issues/detail?id=206043

Change-Id: I8e88a6144f1ede1d45262ff034159de524c24b70
 2016-06-03 13:14:38 -07: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
Wang Xiaolei
0c26c32403 Merge commit \'44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9 
am: f5b0bf3563

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

Change-Id: I7b86da45e999d538641dcc4221c25eb148adf495
 2016-06-03 20:01:37 +00:00
TreeHugger Robot
a087d7f4fa Merge "Delete account from DE and CE databases" into nyc-dev 2016-06-03 20:00:27 +00:00
Jeff Sharkey
f5b0bf3563 Merge commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc' into manual_merge_44b24c9 
Change-Id: Ie4e0b91f5479f43864b86ff013ff8eb7bed6cd86
 2016-06-03 13:53:48 -06:00
Bill Yi
a098b374d0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8ad820ef54 -s ours 
am: 2f09a29ad7  -s ours

* commit '2f09a29ad7c83e94ca357e28ce75ceb4b3d6b183':
  Import translations. DO NOT MERGE

Change-Id: I738435eb28c1a676d6791aea2da7107039180421
 2016-06-03 19:39:34 +00:00
Bill Yi
2f09a29ad7 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 8ad820ef54  -s ours

* commit '8ad820ef5499c42fc47d5b5d60928ba90362f824':
  Import translations. DO NOT MERGE

Change-Id: If55e4d7f6ffde77bdce671f8c771f2fe2fe0d4b7
 2016-06-03 19:31:16 +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
TreeHugger Robot
8ad820ef54 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 19:25:21 +00:00
Pavlin Radoslavov
9136f4f6ce resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp am: 950abbd075 
am: 0b78b922dc

* commit '0b78b922dc405d7f77a0ed0e3b5b1a03941b348b':
  While turning OFF do not honor ON requests.

Change-Id: I6839b7f01ebef00a7eb331842bc943617ec11cef
 2016-06-03 19:15:58 +00: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
Bill Yi
bd398d6c27 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e032b7463 -s ours" into nyc-mr1-dev-plus-aosp 
am: 90ac2096fc  -s ours

* commit '90ac2096fc0d00472f2d66600e98fdbf5799d1b0':
  Import translations. DO NOT MERGE

Change-Id: If8e806fe46665e21fa24853dd4bd85c7c48aa0e0
 2016-06-03 18:51:52 +00:00
Bill Yi
f604fec47f Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours am: cc44ccf2f9 -s ours 
am: 1f914332aa  -s ours

* commit '1f914332aa056c6902d3f8dda7025422ed38958b':

Change-Id: I9744fb39f54d9770c103f919499c90bae95e4544
 2016-06-03 18:51:48 +00:00
Bill Yi
a8420151b6 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours am: 6c4a3962e7 -s ours 
am: f21ed271f6  -s ours

* commit 'f21ed271f60183c55290b6a82d1ad60a8ed6228c':

Change-Id: I19ff40313b8b5eef2df298ae41acc71def6e6972
 2016-06-03 18:51:45 +00:00
Sanket Agarwal
0b78b922dc resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp 
am: 950abbd075

* commit '950abbd0751e863364a1ad976713a959bcb2dc8c':
  While turning OFF do not honor ON requests.

Change-Id: I5bbda2536bd0f33dad2d2b07b24acfb91f27a1ce
 2016-06-03 18:49:24 +00:00
TreeHugger Robot
e20c1e96fc Merge "docs: Update N release notes for DP4" into nyc-dev 2016-06-03 18:48:57 +00:00
fionaxu
1bf6ec2f86 cold sim clean up 
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
  to false if we want to hide "sign in" notification and placed
  carrier-specific notification instead. it is set on connect, once set,
  it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support

Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
 2016-06-03 11:45:12 -07:00
Bill Yi
9103508a09 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours am: 27bdfbf794 -s ours 
am: e55d263d7a  -s ours

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

Change-Id: Iaf7100da143955d62ad5f820d8cb52e2be861322
 2016-06-03 18:34:04 +00:00
Bill Yi
056314c09f Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours am: 373ad6f5a1 -s ours 
am: 0957435430  -s ours

* commit '0957435430e5aa68a904069b15f4c43f9e05e14c':
  Import translations. DO NOT MERGE

Change-Id: I84d25c70b06928294aa13a00dad35858570a6157
 2016-06-03 18:34:00 +00:00
Eino-Ville Talvala
dfba35f54d Merge "Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe am: 564dc9d0f7" into nyc-mr1-dev-plus-aosp 
am: 2d49475635

* commit '2d49475635fb1451de7fb33ef541a64e10fc4414':

Change-Id: I53dedcc3a7ad5da5bd6ffbbfd36aae4dcce2f894
 2016-06-03 18:33:50 +00:00
Android Build Merger (Role)
90ac2096fc Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e032b7463 -s ours" into nyc-mr1-dev-plus-aosp 2016-06-03 18:33:18 +00:00
Bill Yi
ac11fa51e6 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 2e032b7463  -s ours

* commit '2e032b7463bef48b88cd18f2c5b8501a0d80b9ce':
  Import translations. DO NOT MERGE

Change-Id: Ia90dbc3d86b317621b525665a9817cd41b8d497f
 2016-06-03 18:32:44 +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
Bill Yi
1f914332aa Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours 
am: cc44ccf2f9  -s ours

* commit 'cc44ccf2f9e74d6c6138ee4b40ebffecfafde1cf':

Change-Id: I396bbeaa1a0ead5999e96991cdc7471ab0cd283d
 2016-06-03 18:32:27 +00:00
Bill Yi
f21ed271f6 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours 
am: 6c4a3962e7  -s ours

* commit '6c4a3962e7090451da516c56a6da0b3c816e046d':

Change-Id: Id92c6f1f23c7f97d5c312a1df8910b5a30bede61
 2016-06-03 18:32:22 +00:00
Eino-Ville Talvala
bb133d595a Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe am: 02c43050af 
am: 33c4afd13b

* commit '33c4afd13bd7875d598ebb1b0851ea06f07bf831':
  Camera2: Update lensShadingMap documentation

Change-Id: I4fc3e9d505bcb55b0a88f1056ed84a98140eb2fd
 2016-06-03 18:17:36 +00:00
Bill Yi
e55d263d7a Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours 
am: 27bdfbf794  -s ours

* commit '27bdfbf7946eb3e3b760169f85189168eebe60f6':
  Import translations. DO NOT MERGE

Change-Id: If07970d05f867718116d0c3aebebad92a9840a12
 2016-06-03 18:16:07 +00:00
Bill Yi
0957435430 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours 
am: 373ad6f5a1  -s ours

* commit '373ad6f5a1f0e98516a713423302b73a0d82f191':
  Import translations. DO NOT MERGE

Change-Id: I5498cfed6c0e6e4453c38b1f81969d9ca4e1c4b2
 2016-06-03 18:15:58 +00:00
Android Build Merger (Role)
2d49475635 Merge "Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe am: 564dc9d0f7" into nyc-mr1-dev-plus-aosp 2016-06-03 18:12:48 +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
TreeHugger Robot
2e032b7463 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 18:10:17 +00:00
Eino-Ville Talvala
9afeccad95 Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe 
am: 564dc9d0f7

* commit '564dc9d0f7ef869a61b8825d844d7812fdb6f058':
  Camera2: Update lensShadingMap documentation

Change-Id: I2ae7341a799cd78749f3c5b460f48b693780b03b
 2016-06-03 18:10:09 +00:00
Eino-Ville Talvala
33c4afd13b Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe 
am: 02c43050af

* commit '02c43050af6fb528882af36d5f867abe071eebf0':
  Camera2: Update lensShadingMap documentation

Change-Id: If3dbbf28d8024a10f1cd8dc0d93a0a04178474dd
 2016-06-03 18:09:32 +00: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
27bdfbf794 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 10e29e0730  -s ours

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

Change-Id: I52252de40753f1e8b6bc38f738f5385bd1168f73
 2016-06-03 18:02:46 +00:00
Bill Yi
373ad6f5a1 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 93bc210b3f  -s ours

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

Change-Id: If8c66d039bb6cb91fad5011c0f63ca309a80af15
 2016-06-03 18:02:42 +00:00
Eino-Ville Talvala
02c43050af Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 
am: cd44a32dfe

* commit 'cd44a32dfe6a5a39db496af6de7764e164cda6f5':
  Camera2: Update lensShadingMap documentation

Change-Id: I8011b348ebc133ab6664db5948066ded857d5285
 2016-06-03 18:01:57 +00: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
Android Build Merger (Role)
0208df03d8 Merge "Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 2a098206c4 am: 2590281320" 2016-06-03 17:56:24 +00:00