Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
d09ad72e82 Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17 am: 56d4dae9ec" into nyc-mr1-dev-plus-aosp 2016-05-27 03:03:43 +00:00
Android Build Merger (Role)
2cffcf29ce Merge "Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37 am: 6843da1aa8" into nyc-mr1-dev-plus-aosp 2016-05-27 03:03:37 +00:00
Android Build Merger (Role)
380221f94f Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d am: 29e8879307" into nyc-mr1-dev-plus-aosp 2016-05-27 03:03:31 +00:00
Android Build Merger (Role)
2122328c75 Merge "Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am: 72f19ff6f0 am: b59383a375" into nyc-mr1-dev-plus-aosp 2016-05-27 03:03:24 +00:00
Android Build Merger (Role)
d9c7414bf1 Merge "Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am: 1ad12e0678 am: d667ff5930" into nyc-mr1-dev-plus-aosp 2016-05-27 03:03:16 +00:00
Android Build Merger (Role)
b3f3f26046 Merge "Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154deb70 am: 174385a208" into nyc-mr1-dev-plus-aosp 2016-05-27 03:03:10 +00:00
Android Build Merger (Role)
5cc2c12f29 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours am: 02befc3229 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-27 03:03:03 +00:00
Android Build Merger (Role)
88a41ca185 Merge "Merge "add metrics for notification and group expansion" into nyc-dev am: 0f97b8fcbd am: 32b50d9c39" into nyc-mr1-dev-plus-aosp 2016-05-27 03:03:01 +00:00
Tenghui Zhu
2f86522d7d Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17 
am: 56d4dae9ec

* commit '56d4dae9ec7503660bdd762e2e04f267d7f2704c':
  Update the light center when the root view's layout changed

Change-Id: Ifedcb88adb38eb23ad82b7836c5de5f738c80c10
 2016-05-27 03:02:14 +00:00
Phil Burk
f6f5ad9cd0 Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d 
am: 29e8879307

* commit '29e8879307bc0a73f34b12074944c788821a4373':
  AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY

Change-Id: Id74f4c4831fd070cfdfb1228c9813635bd18ccbc
 2016-05-27 03:02:09 +00:00
Manoja Wijewardene
ed64052f54 Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am: 1ad12e0678 
am: d667ff5930

* commit 'd667ff5930240fbb3aab057a9da2a9d173f6b94c':
  Elaborate on requirement to support PreRebootSecurityLogs

Change-Id: Ib6ca093eb4041ff298a31eea5da5bebac6db491c
 2016-05-27 03:02:03 +00:00
Bill Yi
56dd24fdd2 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours 
am: 02befc3229  -s ours

* commit '02befc32293351a93a1ba073ff884e6135c0c121':
  Import translations. DO NOT MERGE

Change-Id: If60580203a307385c138d41f41790e8ca3852120
 2016-05-27 03:01:58 +00:00
Julia Reynolds
83c0970450 Merge "Importance slider updates." into nyc-dev am: 2bf73e94c3 
am: 901bdeadef

* commit '901bdeadef9c293c093e7902b414734b9c63ac2c':
  Importance slider updates.

Change-Id: I2a33854c4fc17435684e159033f3860d3f46a70f
 2016-05-27 03:01:53 +00:00
Jeff Sharkey
e95644447c Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37 
am: 6843da1aa8

* commit '6843da1aa8da6374dde23ef20bad2abfed6aaba2':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: Ie9aff29f7488bd78d13c6915874a3d1ef53e6715
 2016-05-27 03:00:53 +00:00
Bill Yi
adab7c9693 Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414 -s ours 
am: 977d5bbfd2  -s ours

* commit '977d5bbfd2f67d18978ab55fbf26cbcfc282283e':
  Import translations. DO NOT MERGE

Change-Id: I85443596959d0cfd85225f2aa3c336eab2c042e4
 2016-05-27 03:00:13 +00:00
Julia Reynolds
733245e5fb Merge "Importance slider updates." into nyc-dev am: 2bf73e94c3 
am: 19a8d034fb

* commit '19a8d034fbdfb1a6d0ec4b9b808d82f30cbb834f':
  Importance slider updates.

Change-Id: I257ec5f912b9036ec5f18ba249951dd80ad6bc4b
 2016-05-27 02:59:17 +00:00
Jeff Sharkey
58db5505c7 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37 
am: bda14dd987

* commit 'bda14dd987498d4c75dcbbe7b4bba73db165c1c8':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: Ic5577c55324a52e761919febc0cab9af0e18e919
 2016-05-27 02:58:50 +00:00
Jason Monk
f0bb75132a Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am: 72f19ff6f0 
am: b59383a375

* commit 'b59383a375c41936ac5e2865383ef49b267e7b10':
  QS: Make hotspot go unavailable in airplane mode

Change-Id: I5d250ddd412327f9065111b3becb4f2e77a55a73
 2016-05-27 02:58:33 +00:00
Jason Monk
c47f53012e Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am: 72f19ff6f0 
am: 628c714f3e

* commit '628c714f3e3414155f4e477bfa8d76b520ced01b':
  QS: Make hotspot go unavailable in airplane mode

Change-Id: I1db7a4e27b0e518509ac0e51e44c2f3fd781b38b
 2016-05-27 02:58:33 +00:00
Christopher Tate
50aa0324c9 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 am: 0905c8f398 -s ours 
am: d39c0a8d77

* commit 'd39c0a8d775988bfbf319777b2a17af1579b531a':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: Icd0546a4c3d1e01b356958b78ba143e44061515e
 2016-05-27 02:58:27 +00:00
Robin Lee
642d137d8c Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154deb70 
am: 6c3cb2c392

* commit '6c3cb2c3926182245a0e80a7e3c95ff04d032b06':
  Check if we're connected before marking a UID blocked

Change-Id: Ib2b6ddd0d5a6e7a4b825a3113d275d753c5c08b0
 2016-05-27 02:58:19 +00:00
Robin Lee
e4bf124572 Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154deb70 
am: 174385a208

* commit '174385a2084439678bea758733edd893b255d22a':
  Check if we're connected before marking a UID blocked

Change-Id: I31b69b3e7bb307c80c472941f57e480888918a34
 2016-05-27 02:57:33 +00:00
Chris Wren
2c5bcc1bbb Merge "add metrics for notification and group expansion" into nyc-dev am: 0f97b8fcbd 
am: 32b50d9c39

* commit '32b50d9c39f8ffd740d8e95549004559bed2f954':

Change-Id: I545c3ce7b10858d88866b17c800f7e6d82d7fae1
 2016-05-27 02:56:24 +00:00
Teng-Hui Zhu
56d4dae9ec Merge "Update the light center when the root view\'s layout changed" into nyc-dev 
am: e78ba24c17

* commit 'e78ba24c176fd6a0c54eaf7e52be545952ba1ab7':
  Update the light center when the root view's layout changed

Change-Id: Ic973b9b47df6550c5170c2248c7e0f2ab25c6a57
 2016-05-27 02:50:14 +00:00
Phil Burk
29e8879307 Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev 
am: d34d06606d

* commit 'd34d06606dd5be9fc18029e87cb4b56ecef21864':
  AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY

Change-Id: I3c7741fcf914f4e2f6cf89eaec2d72ba519a24b1
 2016-05-27 02:49:44 +00:00
Rubin Xu
d667ff5930 Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev 
am: 1ad12e0678

* commit '1ad12e0678e87e2ed64dcbc878ee2c7136b5ccdb':
  Elaborate on requirement to support PreRebootSecurityLogs

Change-Id: I088c0a0980517d3b4ffa6fe1b1aa9add7620c6e0
 2016-05-27 02:48:59 +00:00
Bill Yi
02befc3229 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 9aed8c2fa0  -s ours

* commit '9aed8c2fa01785be20cd7cc07976670812bc84a0':
  Import translations. DO NOT MERGE

Change-Id: I0305b137eed7ecf9e4b149a0f589e658de16811f
 2016-05-27 02:47:12 +00:00
Bill Yi
977d5bbfd2 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cb8c569414  -s ours

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

Change-Id: I6ed4074aea21921c930baa71f5564b7dd847618e
 2016-05-27 02:46:32 +00:00
Julia Reynolds
19a8d034fb Merge "Importance slider updates." into nyc-dev 
am: 2bf73e94c3

* commit '2bf73e94c389bf9457df132d6eaf294f9d35587f':
  Importance slider updates.

Change-Id: Ia9d063f6422259f80aeee6fe2d27ca1354538955
 2016-05-27 02:43:28 +00:00
Jeff Sharkey
bda14dd987 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev 
am: 36cbf5ca37

* commit '36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
 2016-05-27 02:42:44 +00:00
Jason Monk
628c714f3e Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev 
am: 72f19ff6f0

* commit '72f19ff6f057fff184c875194e802005f8e8fd08':
  QS: Make hotspot go unavailable in airplane mode

Change-Id: Ia21b21a840106fcbd7ca534ee639f43c0487a396
 2016-05-27 02:42:04 +00:00
Robin Lee
6c3cb2c392 Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev 
am: 33154deb70

* commit '33154deb700a8cf5df6fff39f0b3291d1278efa0':
  Check if we're connected before marking a UID blocked

Change-Id: I7a2552f43c66b1b1adb094d3b91ef87648e57bde
 2016-05-27 02:39:45 +00:00
Chris Wren
12f027026e resolve merge conflicts of 0f97b8f to nyc-mr1-dev 
am: 5b3b72e7b7

* commit '5b3b72e7b7a926ac954db23c2ceaf10aa9b32539':
  add metrics for notification and group expansion

Change-Id: I2df2f6e2ba27e4368162ce0642c77ec0a559620e
 2016-05-27 02:39:20 +00:00
Chris Wren
5b3b72e7b7 resolve merge conflicts of 0f97b8f to nyc-mr1-dev 
Change-Id: I5e03144e3ae95777eb651add098eabe8af6ad08e
 2016-05-26 22:28:03 -04:00
Adam Lesinski
89046edb4d Merge "Fix issue where max idle time > total idle time" into nyc-dev 2016-05-27 01:44:32 +00:00
Adrian Roos
7fe83ab54e Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev 2016-05-27 01:04:16 +00:00
Adrian Roos
a8e18ef911 Fix spurious crashes in StatusBarIconView 
Fixes a crash that happens when we cannot look up a package's
resources for reasons.

Change-Id: I4884536a3eefa8fe82bd274925241f4c798e08e3
Fixes: 28982204
 2016-05-26 17:57:25 -07:00
Fyodor Kupolov
0ebf3cc47c Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev 
am: 2c5cbd4012

* commit '2c5cbd4012aef736c94a7afc84a778623c639d10':
  Clean up demo dir when leaving demo mode

Change-Id: Ia7891f8e5106130d669a1daa7fcc691db1f5e4c7
 2016-05-27 00:54:20 +00:00
Fyodor Kupolov
2c5cbd4012 Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev 2016-05-27 00:48:38 +00:00
Roozbeh Pournader
0ca3829d4c Merge "Ellipsize Preference summaries" into nyc-dev 2016-05-27 00:11:14 +00:00
TreeHugger Robot
cef12198a7 Merge "Protect against NPE while to updating service connection activities." into nyc-dev 2016-05-27 00:08:16 +00:00
Rob Carr
58f1167ecf Merge "Ensure surfaces only resize during relayout." into nyc-dev 2016-05-26 23:58:32 +00:00
Garfield Tan
7a91029bff Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev 2016-05-26 23:46:42 +00:00
Robin Lee
32ceb9c801 Merge "Move VPN restriction check into setup dialog" into nyc-dev 2016-05-26 23:41:28 +00:00
Jorim Jaggi
0d35765ca3 Merge "Handle trampoline activites in different tasks" into nyc-dev 2016-05-26 23:38:09 +00:00
Jorim Jaggi
352d584b20 Handle trampoline activites in different tasks 
When the app uses a trampoline activity that launches in a different
task than the main task, we fail to show recents when the task is
docked and the user launches the trampoline activity from home. Add
logic to handle this case.

Bug: 28368989
Change-Id: Iea29e6cd1a9919da0e856955691fac4792e30604
 2016-05-26 16:32:37 -07:00
Android Build Merger (Role)
121fa21ef9 Merge "Merge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8 am: 9f7067bb80" into nyc-mr1-dev-plus-aosp 2016-05-26 23:27:32 +00:00
Android Build Merger (Role)
f322db1e0d Merge "Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb am: 531cd8724c" into nyc-mr1-dev-plus-aosp 2016-05-26 23:27:21 +00:00
Chris Wren
1fc4082c5e Merge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8 
am: 9f7067bb80

* commit '9f7067bb80b79396992b719ac46e8ab47e00ff10':
  boost starred people to at least high importance

Change-Id: Ie452e76ad683e916699d9bfa4ee6d687b6d5d961
 2016-05-26 23:25:35 +00:00
Jonathan Basseri
d099eddf8d Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb 
am: 531cd8724c

* commit '531cd8724cad56e2a141dbe5acbe283372c21de4':

Change-Id: I60f30d1169e65fde080d398a06d2b543a0278238
 2016-05-26 23:24:45 +00:00