Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,354 Commits 3 Branches 0 Tags
d6f9056ff8c7c2c32ca04ef8ad2aca9d4036d3c6
Commit Graph

257354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
d6f9056ff8 Merge "Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 am: 3c570f9a12" into nyc-mr1-dev-plus-aosp 2016-05-31 17:42:09 +00:00
Ricky Wai
45c5f9417c Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 
am: 3c570f9a12

* commit '3c570f9a1261532952f0fc11aefb53b0e558625d':
  Do not get device owner admin info when device owner is null

Change-Id: Iaa58b141c72bb4a419bc40fd8091dd28b239ddbc
 2016-05-31 17:41:25 +00:00
Hall Liu
4e52453d0e Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57 
am: 49459e4ee8

* commit '49459e4ee88dbaa342fb6add9af51ccbadc88d98':
  Disable app pinning when emergency call button pressed

Change-Id: I6cf2181d2f2f8a897b2d5eb8ab9482c11a55dd3c
 2016-05-31 17:41:12 +00:00
Ricky Wai
a263edf14f Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 
am: f2ca8f9c50

* commit 'f2ca8f9c508342eae262348f6752bcd53aff2b83':
  Do not get device owner admin info when device owner is null

Change-Id: I29edf9a63d29c8016ee88f9ebe93d3533c09dbed
 2016-05-31 17:41:07 +00:00
Android Build Merger (Role)
c87bf0ad88 Merge "Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f am: 24d5e1b9ec am: 674cfd13af" into nyc-mr1-dev-plus-aosp 2016-05-31 17:37:42 +00:00
Hall Liu
49459e4ee8 Merge "Disable app pinning when emergency call button pressed" into nyc-dev 
am: 8b655e0f57

* commit '8b655e0f57b071756e7d6a3547eeabe35885bcc9':
  Disable app pinning when emergency call button pressed

Change-Id: Ibe8d37716ad1630359b3ef08350f485b0d1177a7
 2016-05-31 17:37:37 +00:00
Ricky Wai
f2ca8f9c50 Merge "Do not get device owner admin info when device owner is null" into nyc-dev 
am: 21f98459b7

* commit '21f98459b7740f57f6fd0415298cb5f5c0c7e0ae':
  Do not get device owner admin info when device owner is null

Change-Id: Iae5d7d5f9e5f5cf23d8c02bf9a4322e4569be9de
 2016-05-31 17:37:33 +00:00
Dan Yu
3dcf0cf439 Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f am: 24d5e1b9ec 
am: 674cfd13af

* commit '674cfd13af11f6fb5afc8bfe12d0170916f63b54':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: Ia42a12ab97aef348db265e790406316befda07c8
 2016-05-31 17:37:15 +00:00
Dan Yu
ff25af1a7d Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f am: 24d5e1b9ec 
am: 094f3f8328

* commit '094f3f83285bceb7c21012ccb7011696ce91ef18':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I81139553c2620426f8566b3642d369a41e639972
 2016-05-31 17:34:34 +00:00
Ricky Wai
3c570f9a12 Merge "Do not get device owner admin info when device owner is null" into nyc-dev 
am: 21f98459b7

* commit '21f98459b7740f57f6fd0415298cb5f5c0c7e0ae':
  Do not get device owner admin info when device owner is null

Change-Id: I8bca370306be7cafe536dc57d1b1d53dd0f50297
 2016-05-31 17:30:54 +00:00
Hall Liu
8b655e0f57 Merge "Disable app pinning when emergency call button pressed" into nyc-dev 2016-05-31 17:29:37 +00:00
Daniel Yu
674cfd13af Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f 
am: 24d5e1b9ec

* commit '24d5e1b9ec676eea4cb803f584dec3dadc170ab8':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I269a97d21f165148512cd6a76a262839bb659a41
 2016-05-31 17:25:26 +00:00
Daniel Yu
094f3f8328 Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f 
am: 24d5e1b9ec

* commit '24d5e1b9ec676eea4cb803f584dec3dadc170ab8':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I72a5254fcc594069c8ecdba4ce2f496856702797
 2016-05-31 17:25:23 +00:00
Ricky Wai
21f98459b7 Merge "Do not get device owner admin info when device owner is null" into nyc-dev 2016-05-31 17:22:55 +00:00
Dan Yu
24d5e1b9ec Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c 
am: 2ad3221e5f

* commit '2ad3221e5f982dd0b9213c7e600d6186a1a9ea23':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: Iaf555b61ddb9fc6706a67775e76106c8187b4d27
 2016-05-31 17:21:48 +00:00
Daniel Yu
2ad3221e5f Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs 
am: 160ce9413c

* commit '160ce9413ccd5cef62b01f2e7e7fb601c5e8fbf2':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I646cb0a2e9ecc0f783444bb8b63334a37c6e22df
 2016-05-31 17:17:18 +00:00
Dan Yu
160ce9413c Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs 2016-05-31 17:09:24 +00:00
Ricky Wai
90c9dbc919 Do not get device owner admin info when device owner is null 
Bug: 29043723
Change-Id: I355c549f891a5e71f654f42ed16a7139da86482a
 2016-05-31 18:01:46 +01:00
Jason Monk
6c16d440b2 Merge "QS: Update layout to show gear all the time" into nyc-mr1-dev 
am: cb9446453c

* commit 'cb9446453cee802819498348d265d0217878e47f':
  QS: Update layout to show gear all the time

Change-Id: Icda1fccca3583004f3f58b86e844e7f39b355763
 2016-05-31 14:49:33 +00:00
Jason Monk
cb9446453c Merge "QS: Update layout to show gear all the time" into nyc-mr1-dev 2016-05-31 14:39:06 +00:00
Jason Monk
4bb7b1a3e3 QS: Update layout to show gear all the time 
Because evidently, when you've gotta change something, you've really
gotta change something.

Bug: 28673919
Change-Id: I085a0424c134a7f80316397b04a6b120440d32c8
 2016-05-31 10:37:06 -04:00
Android Build Merger (Role)
6d0957aca1 Merge "Merge "Look at last used app when filtering." into nyc-dev am: ce289e937e am: 7c34fd3ccd" into nyc-mr1-dev-plus-aosp 2016-05-31 11:53:59 +00:00
Android Build Merger (Role)
5186ea968b Merge "Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149 am: ff078da846" into nyc-mr1-dev-plus-aosp 2016-05-31 11:53:48 +00:00
Nicolas Geoffray
ae92f47fa3 Merge "Look at last used app when filtering." into nyc-dev am: ce289e937e 
am: 7c34fd3ccd

* commit '7c34fd3ccdfc2ca6dade22f6ee9cb3a57638b669':
  Look at last used app when filtering.

Change-Id: Ia5adaa95a8d59ab0e777d234e30590c05a605d5b
 2016-05-31 11:53:13 +00:00
Nicolas Geoffray
33c560035e Merge "Look at last used app when filtering." into nyc-dev am: ce289e937e 
am: 60fa06a793

* commit '60fa06a793a7b5c35988f8e21d6fa93aaee09ef2':
  Look at last used app when filtering.

Change-Id: I17fef02d34c44ac95c8c175362e3f0f6793bbdd2
 2016-05-31 11:53:06 +00:00
Nicolas Geoffray
00eec4268f Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149 
am: ff078da846

* commit 'ff078da846a8d719d2724bd035d987d8e943afbe':
  Cleanup performDexOpt with instruction sets.

Change-Id: I27003abdb57032999b954e1715afa2230c794492
 2016-05-31 11:53:06 +00:00
Nicolas Geoffray
4b092e47ac Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149 
am: 0063f2c80b

* commit '0063f2c80b1d9512fd77ca71faa85737c1fd2424':
  Cleanup performDexOpt with instruction sets.

Change-Id: If15ee5ff3e58d3bf0226bea94707e228c77fbf08
 2016-05-31 11:53:00 +00:00
Nicolas Geoffray
60fa06a793 Merge "Look at last used app when filtering." into nyc-dev 
am: ce289e937e

* commit 'ce289e937ee6b001cd14824e5dec3c6010b51e61':
  Look at last used app when filtering.

Change-Id: Ia1ce20e1645ea5defce3f72011cacd88388cb3df
 2016-05-31 11:36:41 +00:00
Nicolas Geoffray
7c34fd3ccd Merge "Look at last used app when filtering." into nyc-dev 
am: ce289e937e

* commit 'ce289e937ee6b001cd14824e5dec3c6010b51e61':
  Look at last used app when filtering.

Change-Id: I7c1c693cc76d5067733e5b424dbdac1dcb55c288
 2016-05-31 11:36:38 +00:00
Nicolas Geoffray
0063f2c80b Merge "Cleanup performDexOpt with instruction sets." into nyc-dev 
am: 89f4bff149

* commit '89f4bff149c62baf8371118aed2c4e6ac29976c5':
  Cleanup performDexOpt with instruction sets.

Change-Id: I6293cb0c9adf562d69aac59d74edc6540e6a0693
 2016-05-31 11:36:37 +00:00
Nicolas Geoffray
ff078da846 Merge "Cleanup performDexOpt with instruction sets." into nyc-dev 
am: 89f4bff149

* commit '89f4bff149c62baf8371118aed2c4e6ac29976c5':
  Cleanup performDexOpt with instruction sets.

Change-Id: Id973c65cbe87f54a743bfcb89fbe7e4aea45d1c8
 2016-05-31 11:36:34 +00:00
TreeHugger Robot
ce289e937e Merge "Look at last used app when filtering." into nyc-dev 2016-05-31 11:29:41 +00:00
TreeHugger Robot
89f4bff149 Merge "Cleanup performDexOpt with instruction sets." into nyc-dev 2016-05-31 11:23:44 +00:00
Nicolas Geoffray
fa78b219b7 Look at last used app when filtering. 
In order to cover cases where a device hasn't been used
for a while.

bug:28969280
Change-Id: I897e833ed83912b848f25a7a81fe59f0ee655be1
 2016-05-31 11:13:51 +01:00
Android Build Merger (Role)
e521d70dfa Merge "Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b am: f5464121c0" into nyc-mr1-dev-plus-aosp 2016-05-31 10:01:43 +00:00
Victor Chang
dc4e0336a0 Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b 
am: f5464121c0

* commit 'f5464121c0050bd8926f243a7f84fcc3282864d5':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: I79e1c6ecc0a107db616e3bdf0aff50b4358a8373
 2016-05-31 10:01:08 +00:00
Victor Chang
0075bf312c Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b 
am: d6d2497ebe

* commit 'd6d2497ebe90e74f0ee7ddfdd2a00f4cb2f25dce':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: I7a44158b41c20d297e3e1c2869bb0a58549e84a2
 2016-05-31 09:59:59 +00:00
Victor Chang
f5464121c0 Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev 
am: 98801e9f2b

* commit '98801e9f2bec03faf9be0c8bb961150004d309ff':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: I84db62a24c34bf8dea6f99d34e108cbb0fc0517f
 2016-05-31 09:51:58 +00:00
Victor Chang
d6d2497ebe Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev 
am: 98801e9f2b

* commit '98801e9f2bec03faf9be0c8bb961150004d309ff':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: If8de5a6c200953599bc3965da57b0de2b1dfb76e
 2016-05-31 09:51:44 +00:00
Victor Chang
98801e9f2b Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev 2016-05-31 09:43:37 +00:00
Victor Chang
261c10d0fc Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev am: 76609106b7 
am: 76366146c6

* commit '76366146c6c2732a4c5790c36a3a08139b2ada2c':

Change-Id: I790ff24c819dea11c7d0bc4158f1a7bebd2fb0dc
 2016-05-31 08:39:48 +00:00
Victor Chang
4ad96210a4 Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev am: 76609106b7 
am: 86b4701d7f

* commit '86b4701d7f7c4f4e7d430daa267316f2e8af04ef':
  Fix VPN Request dialog appearing each time VPN is connecting

Change-Id: I7cae7d4c75f367fa9a08bc4e64ef72265485d1ca
 2016-05-31 08:33:32 +00:00
Victor Chang
76366146c6 Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev 
am: 76609106b7

* commit '76609106b72e944eb87782f1c622519f98ff490f':
  Fix VPN Request dialog appearing each time VPN is connecting

Change-Id: Ia3d8b743457a03d38f85442b3e66cab1285826c5
 2016-05-31 08:33:08 +00:00
Victor Chang
86b4701d7f Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev 
am: 76609106b7

* commit '76609106b72e944eb87782f1c622519f98ff490f':
  Fix VPN Request dialog appearing each time VPN is connecting

Change-Id: I67f2434f144ec1eca21092da8b757507072c937d
 2016-05-31 08:27:50 +00:00
Victor Chang
76609106b7 Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev 2016-05-31 08:21:24 +00:00
Victor Chang
aa2e02348a Finish ConfirmDialog when another vpn app is always-on 
Bug:29000925
Change-Id: I1087dbb2c366cebb4583ae0bb97302b3d2caf42c
 2016-05-31 09:11:19 +01:00
Bill Yi
f82c5112d4 Merge "Import translations. DO NOT MERGE" into nyc-dev am: e71cdef7e3 -s ours 
am: fc22bd87ff  -s ours

* commit 'fc22bd87ff22c87eaf7a9dc912f8184a0ce459bd':

Change-Id: I37fee1718ad7261787be24620ccb27f80c90be80
 2016-05-31 05:03:41 +00:00
Bill Yi
d26ce761b4 Merge "Import translations. DO NOT MERGE" into nyc-dev am: ae284e6cb6 -s ours 
am: 4f6969c7eb  -s ours

* commit '4f6969c7eb0c10484d9b4322b28394fd6f88270e':

Change-Id: Ida8cd043cda47a7c8353c4c8827a5690c00bd3d3
 2016-05-31 05:03:22 +00:00
Bill Yi
8bd9f06370 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5854f2aa07 -s ours 
am: 3551359739  -s ours

* commit '3551359739c760a58fd83179e495b030aea2de83':

Change-Id: I03ef37f09d0779319d7690e056744bc6eb4ae69d
 2016-05-31 05:03:01 +00:00
Roozbeh Pournader
1bf8716114 Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24 
am: 08b6d01ccb

* commit '08b6d01ccb7a23c820fd159a10a2abd5c3ffca2c':

Change-Id: I59e03a7c37e4e06c217395200ed54e3917055ce9
 2016-05-31 05:02:40 +00:00