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
Tony Mak
23642330a7 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev 
am: 5ee420c0d5

* commit '5ee420c0d562e9ff55fe9bf03c746bc76fd40d5e':
  Remove PROPERTY_WORK_CALL

Change-Id: I17d204d01b2fc356fa6b70d4c5cd73f4b0a10d6c
 2016-05-23 17:26:45 +00:00
Winson
7fea69c3b6 Catching all exceptions when docking. 
am: f60a4af047

* commit 'f60a4af04779174b39b7d3d277de88ed1204d024':
  Catching all exceptions when docking.

Change-Id: I7ed98c617e3cdc241546d085ede23f49445cd223
 2016-05-23 17:26:43 +00:00
Tony Mak
741e0b14cf Merge "Remove PROPERTY_WORK_CALL" into nyc-dev 
am: 5ee420c0d5

* commit '5ee420c0d562e9ff55fe9bf03c746bc76fd40d5e':
  Remove PROPERTY_WORK_CALL

Change-Id: I038ac8c085d5f6590cf8dfa0abc0864da3dd89e2
 2016-05-23 17:23:51 +00:00
Winson
5e04aeb328 Catching all exceptions when docking. 
am: f60a4af047

* commit 'f60a4af04779174b39b7d3d277de88ed1204d024':
  Catching all exceptions when docking.

Change-Id: I6f7d31e267686de5f9b12161469ca1490de23b15
 2016-05-23 17:23:47 +00:00
Tony Mak
5ee420c0d5 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev 2016-05-23 17:17:27 +00:00
Winson
f60a4af047 Catching all exceptions when docking. 
- Catch all exceptions thrown when docking an activity (similar to when
  we start an activity) to allow us to gracefully handle the failure and
  animate the task back into the stack.

Bug: 28867188
Change-Id: I3f80d261343c0161c5cbfd08a05a1fc6157f653e
 2016-05-23 17:12:33 +00:00
TreeHugger Robot
14447d2f5a Merge "Add demonstration unittest for TetherInterfaceSM" 2016-05-23 17:04:01 +00:00
TreeHugger Robot
047dcbe597 Merge "Extract TetherInterfaceSM to its own class." 2016-05-23 17:03:41 +00:00
Philip P. Moltmann
8aa4856f22 Correct height of add printer list separator 
Do not use listPreferredItemHeightSmall a height for list separator.

Fixes: 28907033
Change-Id: Ibe9744f28e7bd17fb5a298fa3cff0e3d403de10f
 2016-05-23 09:54:39 -07:00
Gustav Sennton
fd07efa44e Load WebView even if WebView relro creation times out. 
There are cases in which the WebView Update Service can stop switching
WebView providers (if the update service is notified about relro
creations an incorrect number of times) and in those cases apps will
fail to load WebView.

In this CL we mitigate this problem by allowing apps to load WebView
even if the time-out is reached and we also decrease the time-out so
apps are less likely to ANR when waiting for the time-out.

This CL does not prevent the update service from ending up in a bad
state - so we will still end up crashing apps if the current WebView
implementation is uninstalled after relro creation fails.

Bug: 28860862
Change-Id: Ib6af3722e17a13db77ef34c37581a6a0e1d045bb
 2016-05-23 17:49:05 +01:00
Jean-Michel Trivi
f04fab160a Recording activity notification: return list of configuration 
Use a list of configurations instead of an array

Bug 28819230

Change-Id: Ia4a3cdabf8337cfb98abe4d0055d497bcab8a5ee
 2016-05-23 09:44:58 -07:00
Felipe Leme
a4aba6eaf5 Fixed enforceMeteredApnPolicy when Data Saver is on. 
When enforceMeteredApnPolicy() is called when Data Saver mode is on and
the caller's UID is not whitelisted, it should add a
NET_CAPABILITY_NOT_METERED to the capabilities.

Change-Id: Ieed4f4a7634ee023ec58c91859263655e0ba62d4
Fixes: 28608499 (and https://code.google.com/p/android/issues/detail?id=208478)
 2016-05-23 09:43:53 -07:00
Victor Chang
12753ded44 Fix Certificate authority installed notification is gone when turning off and on the work mode. 
cause: Work mode is turned on before entering USER_STOPPED state.
Thus, BOOT_COMPLETED broadcast is not sent, but the notification has been dismissed.

use USER_STARTED + USER_UNLOCKED because both are foreground.

Bug: 28864104
Change-Id: I4796b61586e194d8367b9e52a9c56f858cbcbe7d
 2016-05-23 17:41:01 +01:00
Bill Yi
3b549fcd72 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours am: 5745dc0e45 -s ours 
am: 9306f9d98a  -s ours

* commit '9306f9d98ae25c6056b8571d73f48c48f7ce7f22':

Change-Id: I24d12b853256d7b029da6262ae17ae4bbf5e7a79
 2016-05-23 16:19:23 +00:00
Bill Yi
a4ada4c4cc Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d -s ours am: f2475c29e1 -s ours 
am: 7b71c6095d  -s ours

* commit '7b71c6095ddead961cf4da2c484f04dfcf714888':

Change-Id: I35d3845a38b4ef9eb5b93a02a98681f8cb319268
 2016-05-23 16:19:19 +00:00
Bill Yi
5d56a23dd3 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 0b9b896202 -s ours" into nyc-mr1-dev-plus-aosp 
am: bc1848662b  -s ours

* commit 'bc1848662b5f3d2a24017f3f79d00fba52a2d031':

Change-Id: I45ce61469e0bf9c253f20b692339791bb99a854d
 2016-05-23 16:15:36 +00:00
Bill Yi
d9a2eb9eee Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours am: a882b8c150 -s ours" into nyc-mr1-dev-plus-aosp 
am: fa764c3fa3  -s ours

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

Change-Id: If98ee299365005e4ccf892062ba1028ec62e261a
 2016-05-23 16:15:32 +00:00
Bill Yi
bb7813a8a9 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d -s ours am: 712c2cb2d2 -s ours" into nyc-mr1-dev-plus-aosp 
am: d5f71b7f7d  -s ours

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

Change-Id: Ibc01e69354ce33cd24d6de318c29395bf176e5a6
 2016-05-23 16:15:27 +00:00
Bill Yi
d345b4af61 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 1a49e73d2a -s ours" into nyc-mr1-dev-plus-aosp 
am: 71caaa9f9d  -s ours

* commit '71caaa9f9d65e707a74188b0a6db8f05a75112c6':
  Import translations. DO NOT MERGE

Change-Id: I65de625fa8270176de5e164ff959fee9dc01c794
 2016-05-23 16:15:19 +00:00
Bill Yi
ff382e6ce8 Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours" into nyc-mr1-dev am: bb434299c7 -s ours" into nyc-mr1-dev-plus-aosp 
am: 720c041b1a  -s ours

* commit '720c041b1a233e7b5e775056b92144494bd9000c':

Change-Id: I961a0ef7d2d71dafff563b3afc32c68096919993
 2016-05-23 16:13:02 +00:00
Bill Yi
e426faf6fa Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 18947ba2fa -s ours" into nyc-mr1-dev-plus-aosp 
am: 71f8032a6a  -s ours

* commit '71f8032a6a9f4de4337e7157918614bbd67257a6':
  Import translations. DO NOT MERGE

Change-Id: Iac961329f40592c1f23cec49ee9a0a5e8bfc52d0
 2016-05-23 16:12:52 +00:00
Bill Yi
71f88b4adb Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7b9f32be79 -s ours" into nyc-mr1-dev-plus-aosp 
am: b8b4aba44f  -s ours

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

Change-Id: I49b846c4fb947beef95cfcfe20ab7ef1be652233
 2016-05-23 16:12:40 +00:00
Bill Yi
e577b65d57 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e354740de -s ours" into nyc-mr1-dev-plus-aosp 
am: 16dd875f8a  -s ours

* commit '16dd875f8a7c29d5d8093b545b1c84c071067674':
  Import translations. DO NOT MERGE

Change-Id: I0b7186cfc4c89ab730fd60e6ea41064a51d0968b
 2016-05-23 16:12:25 +00:00
Bill Yi
103104dc9b Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours am: ddf0507239 -s ours 
am: 90c743f621  -s ours

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

Change-Id: Idd2ee937d504112501ddb57378015720c80a33a6
 2016-05-23 16:12:09 +00:00
Bill Yi
9306f9d98a Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours 
am: 5745dc0e45  -s ours

* commit '5745dc0e452a272dbaebe26e9e7838431b4ce74f':

Change-Id: I5aae9c5e056a03be099e5766cdbd53ded98e435e
 2016-05-23 16:10:55 +00:00
Bill Yi
7b71c6095d Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d -s ours 
am: f2475c29e1  -s ours

* commit 'f2475c29e1641f84a191fd6a42528487e29eed58':

Change-Id: I734396193f15c59fdbd241774257f7df7b7eac8f
 2016-05-23 16:10:50 +00:00
Wale Ogunwale
8c09c7dd7a Fixed flicker when docking task from recents. 
Regression introduced by ag/1044640 where we don't want recents to the
visible if it's stack isn't fullscreen or focused. However, it is
possible for switching the home stack to not-fullscreen to prolonged
while transitioning to split-screen mode from recents. We now check
for if the docked stack exists which is a better indicator we are in
split-screen mode regardless of if the stask is fullscreen.

Bug: 28882948
Bug: 28246419
Change-Id: I54c02cc1486e7b5bf6a20dd0706c9bfe3f40a953
 2016-05-23 09:10:24 -07:00
Android Build Merger (Role)
bc1848662b Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 0b9b896202 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-23 16:08:11 +00:00
Bill Yi
c1de9659e4 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours 
am: 0b9b896202  -s ours

* commit '0b9b896202b58db23a2cdb21bc59cfe1bc1137a0':

Change-Id: Ie0cab532b3ab7f28e6bb23cde3fcd171f63eca2d
 2016-05-23 16:07:49 +00:00
Android Build Merger (Role)
fa764c3fa3 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours am: a882b8c150 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-23 16:07:12 +00:00
Android Build Merger (Role)
d5f71b7f7d Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d -s ours am: 712c2cb2d2 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-23 16:07:01 +00:00
Bill Yi
8bca50f4c0 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours 
am: a882b8c150  -s ours

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

Change-Id: I6cc14431c73e1b76a4e359e098d96eab6aadbea7
 2016-05-23 16:06:36 +00:00
Bill Yi
a0f6be6363 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d -s ours 
am: 712c2cb2d2  -s ours

* commit '712c2cb2d24d08b6a2d8d9344609be67542002ef':
  Import translations. DO NOT MERGE

Change-Id: If524e5fbedf965b7bb6c0bf04e188c5f2c9de9b8
 2016-05-23 16:06:32 +00:00
Android Build Merger (Role)
71caaa9f9d Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 1a49e73d2a -s ours" into nyc-mr1-dev-plus-aosp 2016-05-23 16:05:52 +00:00
Android Build Merger (Role)
720c041b1a Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours" into nyc-mr1-dev am: bb434299c7 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-23 16:05:42 +00:00
Android Build Merger (Role)
71f8032a6a Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 18947ba2fa -s ours" into nyc-mr1-dev-plus-aosp 2016-05-23 16:05:30 +00:00
Android Build Merger (Role)
b8b4aba44f Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7b9f32be79 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-23 16:05:21 +00:00
Android Build Merger (Role)
16dd875f8a Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e354740de -s ours" into nyc-mr1-dev-plus-aosp 2016-05-23 16:05:14 +00:00
Bill Yi
8c14e3ad91 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours 
am: 1a49e73d2a  -s ours

* commit '1a49e73d2a222b9d74381651f44cb57f040b2163':
  Import translations. DO NOT MERGE

Change-Id: Id3d70f4a031896490a40c395f882f626719b54d8
 2016-05-23 16:04:06 +00:00
Bill Yi
35d17c30e1 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours" into nyc-mr1-dev 
am: bb434299c7  -s ours

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

Change-Id: I853f2818174b6c5653b7414e4a1205d5f1e910b1
 2016-05-23 16:04:01 +00:00
Bill Yi
a4228591c8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 18947ba2fa  -s ours

* commit '18947ba2fa2acae84a3dfb30bd14ead3d19d1a94':
  Import translations. DO NOT MERGE

Change-Id: I42a5885588ddf1d8a0253b0a3afcc42dd08c0a60
 2016-05-23 16:03:54 +00:00
Bill Yi
32fd2e03c5 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 7b9f32be79  -s ours

* commit '7b9f32be79b545b18ca387b8e37947fbed220601':
  Import translations. DO NOT MERGE

Change-Id: Ie240badd55b5c579c8f7b0b7640b38084fd1f47b
 2016-05-23 16:03:46 +00:00
Bill Yi
8b75a32041 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 2e354740de  -s ours

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

Change-Id: Ife4bb5babb193debdf7b9284f91e18d4818956a8
 2016-05-23 16:03:37 +00:00
Bill Yi
5745dc0e45 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 6a983faab3  -s ours

* commit '6a983faab35cc4f22611b0cb8041f4dcbac545dc':
  Import translations. DO NOT MERGE

Change-Id: Ibafdfdf355699c6a8d8461928400639e692500b2
 2016-05-23 16:03:30 +00:00
Bill Yi
f2475c29e1 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7d1246e95d  -s ours

* commit '7d1246e95d0815424e6654af4ef613a7726551b1':
  Import translations. DO NOT MERGE

Change-Id: I8fb493e8cd0005c0269c86209a48cd5e31179f81
 2016-05-23 16:03:27 +00:00
Bill Yi
0b9b896202 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 05be3b4541  -s ours

* commit '05be3b454134afc73ae44cda88af10bead5324a6':
  Import translations. DO NOT MERGE

Change-Id: Ibdb1ab97fd2995e507cec35a52a30063e91c5ff9
 2016-05-23 16:03:23 +00:00
Bill Yi
90c743f621 Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours 
am: ddf0507239  -s ours

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

Change-Id: Ib64bfe467ed10f2f513cbaf3b6f6cfd892d6230d
 2016-05-23 16:03:19 +00:00
Bill Yi
a882b8c150 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 6a983faab3  -s ours

* commit '6a983faab35cc4f22611b0cb8041f4dcbac545dc':
  Import translations. DO NOT MERGE

Change-Id: If7150468a26a9a259b7696d2ee3594518ba0a213
 2016-05-23 15:57:49 +00:00
Bill Yi
712c2cb2d2 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7d1246e95d  -s ours

* commit '7d1246e95d0815424e6654af4ef613a7726551b1':
  Import translations. DO NOT MERGE

Change-Id: I320c2898acb42393e12e98e2b750bbc854f634d2
 2016-05-23 15:57:47 +00:00
Bill Yi
522e8890a8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bf97e34678 -s ours 
am: def7b43a66  -s ours

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

Change-Id: I2cf7e9f520f6bea45cc06f3da42f050a39d9909c
 2016-05-23 15:57:46 +00:00