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
Joe Onorato
8472eee461 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 am: c3db3e217f 
am: 4f5febce80

* commit '4f5febce80711166077bb9b40d76bc51cc8cf848':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: I9e404c94c56fcb0a62a141b353dd76932947ca76
 2016-05-23 21:54:59 +00:00
Selim Cinek
d7fb49afa2 Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214 am: 8a87d24e96 
am: 779b41bd64

* commit '779b41bd64dd748039a818fdfcc714ff181bd0a6':

Change-Id: Ie07d195f29e50f226b3d79e1c26bee1a894f97f5
 2016-05-23 21:54:35 +00:00
Selim Cinek
c1f062a7e0 Merge "Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214 am: c91da73326" into nyc-mr1-dev-plus-aosp 
am: f223d7e221

* commit 'f223d7e22184a1c4036d854f5465023dd06ee777':

Change-Id: I5df62ee7141c90e13390f96c21ac0013b20a730b
 2016-05-23 21:54:09 +00:00
Selim Cinek
72a691d509 Merge "Fixed a flashing when the affordances were launched" into nyc-dev am: a56e732c01 am: bdfa6d9fcf 
am: 9a18887ecf

* commit '9a18887ecf803bb40e1c032b3b2096c2e66d3f95':
  Fixed a flashing when the affordances were launched

Change-Id: If57609120976df4db1b9b58c48d2a304c878071d
 2016-05-23 21:51:40 +00:00
Dianne Hackborn
5035d29dcc Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x 
Uh, yeah.

Change-Id: I452187fcdda634ebf00e5d6bcaa45433f348c17e
 2016-05-23 14:39:45 -07:00
Adrian Roos
4d10db7fdd Fix RemoteViewsTests 
Change-Id: I99d1f3b5521e3efad419074fede7eaef5707216d
 2016-05-23 21:33:54 +00:00
Fyodor Kupolov
6954259edb Additional clean up in onUserRemovedLPw 
mDefaultPermissionsGranted, mFingerprints should be cleaned up.

Bug: 28913107
Change-Id: I3758985fe742d38e43538b5221fc3f436c55cb16
 2016-05-23 14:22:38 -07:00
Daniel Nishi
395d387c2c Add a flag to toggle the automatic storage manager on and off. 
This flag will be used in both Settings and Setup Wizard to enable
and disable the automatic storage manager.

Bug:28905328
Change-Id: Iafc374448d96171ad0a4c36f6fea5e0118105a8c
 2016-05-23 14:20:22 -07:00
Android Build Merger (Role)
f53e945c5c Merge "Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: 7399079b5b" into nyc-mr1-dev-plus-aosp 2016-05-23 21:11:44 +00:00
Jean-Michel Trivi
a46586637d Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 
am: 7399079b5b

* commit '7399079b5b6af59aceba6c4a4070fdf7afe432c0':
  Only resuming starting dontWaitForPause activity once

Change-Id: I28a1b0fb32c521ae990e96375fdb819dc12c95ca
 2016-05-23 21:10:26 +00:00
Wale Ogunwale
51fb90bf29 Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev am: 42d4a337a3 
am: 22ff8d0779

* commit '22ff8d07796a9fc382bc364bae490dec9d258ec5':
  Only resuming starting dontWaitForPause activity once

Change-Id: Idd556009a345aee1b7166934aaccfbd4c2e1787f
 2016-05-23 21:10:09 +00:00
Android Build Merger (Role)
6252410588 Merge "Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: bbcf18dbfd" into nyc-mr1-dev-plus-aosp 2016-05-23 21:07:22 +00:00
Jean-Michel Trivi
d90f716876 Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 
am: bbcf18dbfd

* commit 'bbcf18dbfd7e3e96ee14b1ee30b6ba99f99ff252':
  Recording activity notification: return list of configuration

Change-Id: Ia0456b55cb097f2c5d2206f898c72bed90b867c2
 2016-05-23 21:06:33 +00:00
Jean-Michel Trivi
740c0424f0 Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 
am: f2c8fb8620

* commit 'f2c8fb8620224eecfbc344a203e32e6563afcfd6':
  Recording activity notification: return list of configuration

Change-Id: I795d0a76efd044630cd275060dd6c11d595f0e82
 2016-05-23 21:06:05 +00:00
Adrian Roos
f5faf9db14 Deprecate unnecessairy Notification.Style constructors 
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes: 28775574
 2016-05-23 14:00:07 -07:00
Wale Ogunwale
7399079b5b Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev 
am: 42d4a337a3

* commit '42d4a337a3b1a14f4d9daf6eb8275a01ba20e680':
  Only resuming starting dontWaitForPause activity once

Change-Id: I5cc6a322d6c3cdd9bd28ea4a996fe960b1cefd81
 2016-05-23 20:59:00 +00:00
Wale Ogunwale
22ff8d0779 Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev 
am: 42d4a337a3

* commit '42d4a337a3b1a14f4d9daf6eb8275a01ba20e680':
  Only resuming starting dontWaitForPause activity once

Change-Id: Idb9949737a0ee5cfbabd6fad532f24f7ec769ace
 2016-05-23 20:58:58 +00:00
Jean-Michel Trivi
bbcf18dbfd Merge "Recording activity notification: return list of configuration" into nyc-dev 
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
  Recording activity notification: return list of configuration

Change-Id: I926b2cacd7a645ec42f249a0d45a6a822f05eded
 2016-05-23 20:56:04 +00:00
Jean-Michel Trivi
f2c8fb8620 Merge "Recording activity notification: return list of configuration" into nyc-dev 
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
  Recording activity notification: return list of configuration

Change-Id: I02faeadaae995371e2d723415f0b2e3a78f2c489
 2016-05-23 20:55:58 +00:00
TreeHugger Robot
42d4a337a3 Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev 2016-05-23 20:51:40 +00:00
Jean-Michel Trivi
c991879f29 Merge "Recording activity notification: return list of configuration" into nyc-dev 2016-05-23 20:49:30 +00:00
Adrian Roos
b56fb5b712 resolve merge conflicts of 5937d9e to master 
Change-Id: I777ddff515bddd24cbc82c43f7c2c952847cb894
 2016-05-23 13:30:54 -07:00
TreeHugger Robot
bc1eb10773 Merge "sysui: disable clock when device is not provisioned." 2016-05-23 20:15:35 +00:00
Jason Monk
4494879fb7 Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7 
am: ae8b7259f5

* commit 'ae8b7259f59eb3208517f6e3558b9ba991f39b96':

Change-Id: Iebc60c74712a3d1b259f7d10d68aee850be79cc5
 2016-05-23 20:10:23 +00:00
Chad Brubaker
ef88f26b03 Track changes to network security config manifest configuration 
Bug: 28908502
Bug: 28763009
Change-Id: If104c2344287ac3e19c34ff0e7cbff0cd6e95c98
 2016-05-23 13:09:54 -07:00
Android Build Merger (Role)
620b410547 Merge "Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7 am: 7143013049" into nyc-mr1-dev-plus-aosp 2016-05-23 20:07:58 +00:00
Android Build Merger (Role)
71a9b4cb59 Merge "Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c92 am: 7f26540426" into nyc-mr1-dev-plus-aosp 2016-05-23 20:07:48 +00:00
Jason Monk
909fdc0c8c Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7 
am: 7143013049

* commit '71430130496299138f1f65875a2162927883412e':
  Make battery labels translatable.

Change-Id: I503c0c66b06e076dfa2ea36f6a14828cbc7c5d6b
 2016-05-23 20:07:16 +00:00
Sid Soundararajan
df8d745d67 Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c92 
am: 7f26540426

* commit '7f2654042655d32714cc59fd857f24fc7b284f77':
  Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: I3aba988e5e61c51d67180aad0d7eb1f41b78c245
 2016-05-23 20:07:12 +00:00
Jason Monk
ae8b7259f5 Merge "Make battery labels translatable." into nyc-dev 
am: 14abed66d7

* commit '14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
  Make battery labels translatable.

Change-Id: Ic945adf122822b17d91ade4cf0a1d7eb4e6b4cb9
 2016-05-23 20:07:08 +00:00
Ben Lin
c6905cfb11 Register change Uri and notify changes in bugreportServices. 
Bug: 28767380
Change-Id: Ia4d1f5a2e44881d300f2869c628d4990406caf40
(cherry picked from commit 6c9ff513c6d7d3de7ab8920d88111c2b1dc1bb1f)
(cherry picked from commit 93fafd67a6)
 2016-05-23 20:07:04 +00:00
Sid Soundararajan
20c4aea8c5 Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c92 
am: 809bb0f195

* commit '809bb0f1957d92e9fc3a84c56573dddd6ce50162':
  Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: Icd9595a35f31b4e669bf6e66afd2073fc170e274
 2016-05-23 20:07:01 +00:00
Jason Monk
7143013049 Merge "Make battery labels translatable." into nyc-dev 
am: 14abed66d7

* commit '14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
  Make battery labels translatable.

Change-Id: I634eca6f143a5a6d103f49107e57db879b2ca633
 2016-05-23 20:03:51 +00:00
Sid Soundararajan
809bb0f195 Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev 
am: 0513125c92

* commit '0513125c92789912214235faad26e7a97184a53a':
  Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: I617796ca2d7476801517587cf81f29f8edc93d2d
 2016-05-23 20:01:38 +00:00
Sid Soundararajan
7f26540426 Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev 
am: 0513125c92

* commit '0513125c92789912214235faad26e7a97184a53a':
  Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: I057727feb949fc864c3396ef53f9fba331f65ba8
 2016-05-23 20:01:03 +00:00
Jason Monk
14abed66d7 Merge "Make battery labels translatable." into nyc-dev 2016-05-23 19:58:49 +00:00
Sid Soundararajan
0513125c92 Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev 2016-05-23 19:56:43 +00:00
Android Build Merger (Role)
29edf05f2a Merge "Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 am: 97cdd11f2a" into nyc-mr1-dev-plus-aosp 2016-05-23 19:54:33 +00:00
Joe Onorato
4f5febce80 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 
am: c3db3e217f

* commit 'c3db3e217f397153e9982bb29e37fc28e01062d2':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: Iddfcdfeb0ad1194488ce504d420696a83d20a786
 2016-05-23 19:54:10 +00:00
Joe Onorato
399fe3c625 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 
am: 97cdd11f2a

* commit '97cdd11f2a46a9919a615436dd0ddeeb88945c61':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: I19c639267c69783a975361f5aa5fae083e5eb695
 2016-05-23 19:54:10 +00:00
Joe Onorato
c3db3e217f Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev 
am: 4dbdd5d971

* commit '4dbdd5d97155364305abf7c010c165f1a6f79edb':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: Ic86eb0ad4278dc2d0b7f93148bab00a1f707dc16
 2016-05-23 19:50:45 +00:00
Joe Onorato
97cdd11f2a Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev 
am: 4dbdd5d971

* commit '4dbdd5d97155364305abf7c010c165f1a6f79edb':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: I3c455fe69244927dc5aebdf5ddb7b0badf6aeee8
 2016-05-23 19:50:36 +00:00
TreeHugger Robot
4dbdd5d971 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev 2016-05-23 19:46:49 +00:00
Selim Cinek
779b41bd64 Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214 
am: 8a87d24e96

* commit '8a87d24e968e367c3f3878371f744ebc0a33b257':

Change-Id: Ieecb7d00d3f26ec371687ccaa855ec5e0b9358be
 2016-05-23 19:43:55 +00:00
Android Build Merger (Role)
f223d7e221 Merge "Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214 am: c91da73326" into nyc-mr1-dev-plus-aosp 2016-05-23 19:39:20 +00:00
Selim Cinek
930694df48 Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214 
am: c91da73326

* commit 'c91da7332696afc6fc3594cb9e090c2897109f49':
  Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I513c76ed5bf5e0a72aa7db1cdcf15043172d66de
 2016-05-23 19:38:49 +00:00
Selim Cinek
9a18887ecf Merge "Fixed a flashing when the affordances were launched" into nyc-dev am: a56e732c01 
am: bdfa6d9fcf

* commit 'bdfa6d9fcfbfeb2f792770c9a71f58cb0eb4d119':
  Fixed a flashing when the affordances were launched

Change-Id: I99310a591fc9943b35bdc0436bcef6736cfe37cd
 2016-05-23 19:38:31 +00:00
Selim Cinek
5937d9ec0d Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214 
am: 71d7ca4e92

* commit '71d7ca4e92c5f4899797590467d8996ef2ae5884':
  Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I16d09de65dc58d83d20eb7b8e6ddbc3480b118bf
 2016-05-23 19:38:27 +00:00
Selim Cinek
47da87834a Merge "Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8 am: d4962867bd" into nyc-mr1-dev-plus-aosp 
am: 2bb3e37630

* commit '2bb3e3763021b14597e1addd9ef7a3e1ecf911d4':

Change-Id: Id8c3107bb5601f79121492b2029bf2293c5291e3
 2016-05-23 19:35:09 +00:00
Selim Cinek
93c811798f Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8 am: 45df222972 
am: eca834dd8c

* commit 'eca834dd8c8b4acbb8a6a870d76e9fb74dcdcc4e':
  Fixed a crash with the autocancelling

Change-Id: If9343d4a276de3b81270221f74a9468e44a9274a
 2016-05-23 19:35:04 +00:00