Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
239,194 Commits 3 Branches 0 Tags
bfbcf324fe29aed0977647039e685d17cfe13ccf
Commit Graph

239194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Todd Kennedy
bfbcf324fe Merge "Allow app downgrades" into nyc-dev am: b0f6e311ce 
am: 52e1a26891

* commit '52e1a2689125a048e027068f31a2145a97de2042':
  Allow app downgrades
 2016-03-11 23:58:23 +00:00
Alan Viverette
0a0bc9b31d Merge "Ensure Outline consistently sets the radius to be undefined" into nyc-dev am: 48653d225b 
am: eea8618f7e

* commit 'eea8618f7e7416d1bdad3467888bd718ea94eaeb':
  Ensure Outline consistently sets the radius to be undefined
 2016-03-11 23:58:22 +00:00
Todd Kennedy
8e3a15b474 Merge "Add minSdk to dumpsys" into nyc-dev am: 1374af2c7b 
am: aa2b0035de

* commit 'aa2b0035de76a44e2624dd2a4a03408b097e7ac5':
  Add minSdk to dumpsys
 2016-03-11 23:58:21 +00:00
Todd Kennedy
52e1a26891 Merge "Allow app downgrades" into nyc-dev 
am: b0f6e311ce

* commit 'b0f6e311ce19add792048db855844e542e808dd6':
  Allow app downgrades
 2016-03-11 23:54:03 +00:00
Alan Viverette
eea8618f7e Merge "Ensure Outline consistently sets the radius to be undefined" into nyc-dev 
am: 48653d225b

* commit '48653d225b964f4e62e5e94d98966826875dd99c':
  Ensure Outline consistently sets the radius to be undefined
 2016-03-11 23:54:01 +00:00
Todd Kennedy
aa2b0035de Merge "Add minSdk to dumpsys" into nyc-dev 
am: 1374af2c7b

* commit '1374af2c7be265701b9b402b7d4749ffe716ef01':
  Add minSdk to dumpsys
 2016-03-11 23:54:00 +00:00
Todd Kennedy
b0f6e311ce Merge "Allow app downgrades" into nyc-dev 2016-03-11 19:38:35 +00:00
Todd Kennedy
c84d1ab11a Allow app downgrades 
only system apps can do this

Change-Id: If0947f13f5c447f9396690bfda3ad40b07fbbb6b
 2016-03-11 11:37:17 -08:00
Alan Viverette
48653d225b Merge "Ensure Outline consistently sets the radius to be undefined" into nyc-dev 2016-03-11 19:34:05 +00:00
Todd Kennedy
1374af2c7b Merge "Add minSdk to dumpsys" into nyc-dev 2016-03-11 19:26:37 +00:00
Todd Kennedy
89d60189cd Add minSdk to dumpsys 
Bug: 27526333
Change-Id: I0148275013ebab899bcb63c07d71a840539c1863
 2016-03-11 11:18:32 -08:00
Alan Viverette
a019841dd1 Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev am: 79936ddda4 
am: a3710fbd27

* commit 'a3710fbd2780fe6decd11d2bc259f0c3b6e28f71':
  Add consistent @NonNull annotations for drawable callbacks
 2016-03-11 18:59:49 +00:00
Winson
d8adcdeff8 Fixing issue where screenshot notification remains non-dismissible. am: 44dbe294fb 
am: 65c0e2efb7

* commit '65c0e2efb70597b101b1e60d5007311e1594208c':
  Fixing issue where screenshot notification remains non-dismissible.
 2016-03-11 18:59:48 +00:00
Winson
3672860257 Prevent crash with invalid cancelled params. am: c7aa65b8d5 
am: 493f557134

* commit '493f5571342e7f5686bffd54f942b6de58782a6d':
  Prevent crash with invalid cancelled params.
 2016-03-11 18:59:47 +00:00
Eino-Ville Talvala
dccaa2809e Merge "Camera2: Add buffer drop error callback" into nyc-dev am: 95171050e9 
am: e398d06352

* commit 'e398d063523a492c2f3b27a9bc5611e702893efb':
  Camera2: Add buffer drop error callback
 2016-03-11 18:59:46 +00:00
Alan Viverette
a3710fbd27 Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev 
am: 79936ddda4

* commit '79936ddda4c8d1709f736cda013070c3ab32db6f':
  Add consistent @NonNull annotations for drawable callbacks
 2016-03-11 18:49:50 +00:00
Winson
65c0e2efb7 Fixing issue where screenshot notification remains non-dismissible. 
am: 44dbe294fb

* commit '44dbe294fbf06a1def61c48e758621e61ce23b08':
  Fixing issue where screenshot notification remains non-dismissible.
 2016-03-11 18:49:49 +00:00
Winson
493f557134 Prevent crash with invalid cancelled params. 
am: c7aa65b8d5

* commit 'c7aa65b8d5e1596b8c1e11ad676725943169d272':
  Prevent crash with invalid cancelled params.
 2016-03-11 18:49:48 +00:00
Alan Viverette
79936ddda4 Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev 2016-03-11 18:42:43 +00:00
Winson
44dbe294fb Fixing issue where screenshot notification remains non-dismissible. 
- Ensure that we start the screenshot as a foreground service to reduce
  likelihood that it is killed while taking a screenshot.
- If the screenshot process times out or gets killed for any reason, 
  ensure that we update the notification with an appropriate error 
  message.

Bug: 27389179
Change-Id: I5007bda95538044bc753e4ceffd2f59a069c857b
 2016-03-11 10:39:41 -08:00
Winson
c7aa65b8d5 Prevent crash with invalid cancelled params. 
Bug: 27368990
Change-Id: I3eaa9e0391a4149da29bb5dc638ef152f5125bc6
 2016-03-11 10:39:41 -08:00
Eino-Ville Talvala
e398d06352 Merge "Camera2: Add buffer drop error callback" into nyc-dev 
am: 95171050e9

* commit '95171050e9877deb9b1f84b4c55aa828229e2809':
  Camera2: Add buffer drop error callback
 2016-03-11 18:18:13 +00:00
Eino-Ville Talvala
95171050e9 Merge "Camera2: Add buffer drop error callback" into nyc-dev 2016-03-11 18:13:01 +00:00
Makoto Onuki
a1b8a1e5fa Merge "Fix caller validation on secondary user." into nyc-dev am: d51b363c0d 
am: a9e752f401

* commit 'a9e752f401a7c0405ca4312f0d3dd277e9bb6d32':
  Fix caller validation on secondary user.
 2016-03-11 18:10:05 +00:00
Makoto Onuki
94ae124147 Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev am: 04efe9e5ff 
am: 0408672bcb

* commit '0408672bcbc9a23ff2c83962ceb8399aa0dbc087':
  Test for ShortcutManager.updateShortcuts(), also
 2016-03-11 18:10:04 +00:00
Sanket Padawe
0438fcd50c Fix build failure. am: 44729c613f am: 69e24384a7 
am: 0bc008557f

* commit '0bc008557fef6b2193fb4950236f03c86862879b':
  Fix build failure.
 2016-03-11 18:06:03 +00:00
Makoto Onuki
a9e752f401 Merge "Fix caller validation on secondary user." into nyc-dev 
am: d51b363c0d

* commit 'd51b363c0dff6bad46093db474ae314db33d0157':
  Fix caller validation on secondary user.
 2016-03-11 18:06:02 +00:00
Makoto Onuki
0408672bcb Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev 
am: 04efe9e5ff

* commit '04efe9e5ff56ff6c4db6fe7eb4c35acb5b6f61ac':
  Test for ShortcutManager.updateShortcuts(), also
 2016-03-11 18:06:01 +00:00
Sanket Padawe
0bc008557f Fix build failure. am: 44729c613f 
am: 69e24384a7

* commit '69e24384a7bf4051ca30fdd1e1338fdfd0416cf4':
  Fix build failure.
 2016-03-11 18:01:32 +00:00
Makoto Onuki
d51b363c0d Merge "Fix caller validation on secondary user." into nyc-dev 2016-03-11 18:00:40 +00:00
Makoto Onuki
04efe9e5ff Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev 2016-03-11 18:00:18 +00:00
Sanket Padawe
69e24384a7 Fix build failure. 
am: 44729c613f

* commit '44729c613fe65fd9b2f14b1844c1f02ba94ad498':
  Fix build failure.
 2016-03-11 17:59:34 +00:00
Sanket Padawe
44729c613f Fix build failure. 
+ Fix build failure caused by
https://partner-android-review.googlesource.com/#/c/538910/

Change-Id: I83b579f3db4c5a167b206318edcc627c6d2f4b0a
 2016-03-11 09:50:56 -08:00
twen.chang
9d6f50149c Merge "Add RIL Error code list" into mm-wireless-dev am: 49916d39e9 am: 839b547cdc 
am: ba2d9c4261

* commit 'ba2d9c4261705a100592d389a153a9f5628a458c':
  Add RIL Error code list
 2016-03-11 17:43:36 +00:00
Teng-Hui Zhu
66f763df6b Merge "Add the missing overriden API" into nyc-dev am: 335875bb48 
am: 86a4323578

* commit '86a43235780398cf7de034a58a8e44975556618e':
  Add the missing overriden API
 2016-03-11 17:43:35 +00:00
twen.chang
ba2d9c4261 Merge "Add RIL Error code list" into mm-wireless-dev am: 49916d39e9 
am: 839b547cdc

* commit '839b547cdc2cb4b228aef7ccf3e9dedc74832a25':
  Add RIL Error code list
 2016-03-11 17:39:29 +00:00
Teng-Hui Zhu
86a4323578 Merge "Add the missing overriden API" into nyc-dev 
am: 335875bb48

* commit '335875bb480d340e5dfed19bd4512df0c177674d':
  Add the missing overriden API
 2016-03-11 17:39:28 +00:00
twen.chang
839b547cdc Merge "Add RIL Error code list" into mm-wireless-dev 
am: 49916d39e9

* commit '49916d39e9d27acbc6fb28b38abc78ad5dada5a4':
  Add RIL Error code list
 2016-03-11 17:37:06 +00:00
Tenghui Zhu
335875bb48 Merge "Add the missing overriden API" into nyc-dev 2016-03-11 17:36:00 +00:00
Sanket Padawe
49916d39e9 Merge "Add RIL Error code list" into mm-wireless-dev 2016-03-11 17:31:56 +00:00
Mady Mellor
cac68572aa Merge "Improve interaction around showing / hiding the gear behind notifications" into nyc-dev am: e11936725e 
am: cb63e99b08

* commit 'cb63e99b0825be83e5d391880a497ceed31af4b2':
  Improve interaction around showing / hiding the gear behind notifications
 2016-03-11 17:10:34 +00:00
Mady Mellor
cb63e99b08 Merge "Improve interaction around showing / hiding the gear behind notifications" into nyc-dev 
am: e11936725e

* commit 'e11936725e6227c98f356572cbfd512f16b98c3b':
  Improve interaction around showing / hiding the gear behind notifications
 2016-03-11 17:08:26 +00:00
Mady Mellor
e11936725e Merge "Improve interaction around showing / hiding the gear behind notifications" into nyc-dev 2016-03-11 17:03:58 +00:00
Jason Monk
ef894f24ea Merge "Set QS edit overflow bg" into nyc-dev am: 18fafa4be7 
am: 1b1480f27c

* commit '1b1480f27cdd28ea9ba7346bef88e318f6bb5a9a':
  Set QS edit overflow bg
 2016-03-11 16:11:02 +00:00
Jason Monk
1b1480f27c Merge "Set QS edit overflow bg" into nyc-dev 
am: 18fafa4be7

* commit '18fafa4be7de36cb319afe2d0faf258b24c39d1c':
  Set QS edit overflow bg
 2016-03-11 16:07:06 +00:00
Jason Monk
18fafa4be7 Merge "Set QS edit overflow bg" into nyc-dev 2016-03-11 16:00:48 +00:00
Jason Monk
a8321e6ab7 Set QS edit overflow bg 
Bug: 27396825
Change-Id: I656e49f66518f23bd05d59392f43fc1227207666
 2016-03-11 11:00:20 -05:00
Steve McKay
a238074f4e Merge "More snazzy animation for UX happiness." into nyc-dev am: a45612b777 
am: ec2e5392ce

* commit 'ec2e5392cef6823262382da35b13454006da88ad':
  More snazzy animation for UX happiness.
 2016-03-11 15:52:49 +00:00
Steve McKay
ec2e5392ce Merge "More snazzy animation for UX happiness." into nyc-dev 
am: a45612b777

* commit 'a45612b7776edd2b8cd516c5ea78247e906d02af':
  More snazzy animation for UX happiness.
 2016-03-11 15:48:51 +00:00
Steve McKay
a45612b777 Merge "More snazzy animation for UX happiness." into nyc-dev 2016-03-11 15:42:02 +00:00