Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,966 Commits 3 Branches 0 Tags
b27dbd21510707bcb7957ce587f206b062eba5df
Commit Graph

5211 Commits

Author SHA1 Message Date
Paul Crowley
ef370c0ca0 am 05f23d97: am f57d9dcb: am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 
* commit '05f23d974bdfc5fb221f0bfa5bef4e9c915e52d9':
  Add a tag to separate paragraphs in Javadoc
 2014-12-02 15:04:15 +00:00
Paul Crowley
05f23d974b am f57d9dcb: am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 
* commit 'f57d9dcbc7ecbae8bc8f821532a508c22bc3327f':
  Add a tag to separate paragraphs in Javadoc
 2014-12-02 14:57:31 +00:00
Paul Crowley
fbeeac8266 Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 2014-12-02 14:44:27 +00:00
Paul Crowley
2934b266e5 Add a tag to separate paragraphs in Javadoc 
Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456
 2014-12-02 11:21:13 +00:00
Alan Viverette
643b4aa61d am 02cd927d: am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '02cd927dffa24479a0ca29b40ead7b28f9e60a7c':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 20:07:27 +00:00
Alan Viverette
02cd927dff am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '53644fb5acd394b875723b6483215ba837f8e6c0':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 20:00:49 +00:00
Craig Mautner
8bbcd72c8b am b97f7190: am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit 'b97f719036b15c81aeb561ae0d2b4da68e7a06e8':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 05:33:32 +00:00
Craig Mautner
b97f719036 am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit 'fac55682148e6d9c6b4e24769369e2b76ab018ac':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 05:26:47 +00:00
Craig Mautner
208bd91b24 Merge "[ActivityManager] Avoid system server crash due to package removed" 2014-12-01 00:11:52 +00:00
Alan Viverette
d26276d9e3 Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked 
BUG: 18541882
Change-Id: I2ba4611e08ba08667ef5ee4fb556d1c9075ca6d2
 2014-11-26 16:08:58 -08:00
Paul Crowley
5ff0e5fb6b am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '0d122e265c52ef25dbad652378b3a5e51a86f041':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:09:51 +00:00
Paul Crowley
0d122e265c am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit 'ba94fd5e6c243c6256a1627a41aaab52a74747d6':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:02:37 +00:00
Paul Crowley
a7e87acb24 Add flag for wiping factory reset protection data. 
Bug: 18366448
Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
 2014-11-25 20:48:41 +00:00
Adrian Roos
e1d84dd914 am 9a4d0257: am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '9a4d0257beadf53c706afbcb4abc76c17a44ff00':
  Fix DPM.resetPassword("")
 2014-11-25 15:15:35 +00:00
Christoph Studer
18032a083a am fe6d4f09: am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit 'fe6d4f094d2441314bb31fec10b520f80aeb481e':
  Fix MediaStyle API comments
 2014-11-25 15:15:31 +00:00
Adrian Roos
9a4d0257be am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '520d20c1a8c2fbd0d6b7fdc19415167a6f45c866':
  Fix DPM.resetPassword("")
 2014-11-25 15:09:24 +00:00
Christoph Studer
fe6d4f094d am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit '30646d87f240cd17917ad6d1ae83306d284b58b5':
  Fix MediaStyle API comments
 2014-11-25 15:09:18 +00:00
Wink Saville
5c11e41b1a am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:13:01 +00:00
Wink Saville
b4c5410987 am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:06:09 +00:00
Adrian Roos
702d9e31b1 Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 2014-11-24 16:02:11 +00:00
Christoph Studer
e935fe918e Fix MediaStyle API comments 
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
 2014-11-24 14:18:06 +01:00
Robin Lee
0d5ccb7378 Ensure that private key is PKCS#8-encoded 
getEncoded() is not requred to return a PKCS#8-encoded result.

Bug: 15065444
Change-Id: I1278ff9ffffe5887f149bae9288a174beed5f86a
 2014-11-24 10:10:39 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:08:16 -08:00
Amith Yamasani
9d4e6a8355 am 1f26bf6b: am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '1f26bf6bfd683b840f688b41d285fd9c942e6ed5':
  Different messages when wiping user and not device
 2014-11-22 00:00:01 +00:00
Jeff Brown
fd72097736 am 4c9041cf: am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '4c9041cf837cda13c749b148661d18c3fab0fbd6':
  Support keeping activities resumed while dozing.
 2014-11-21 23:13:49 +00:00
Amith Yamasani
1f26bf6bfd am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '108bdbc934d1e5fb77406d0267ab67f8736dfc57':
  Different messages when wiping user and not device
 2014-11-21 23:07:03 +00:00
Amith Yamasani
efb2df698a Merge "Different messages when wiping user and not device" into lmp-mr1-dev 2014-11-21 22:27:17 +00:00
Jeff Brown
4c9041cf83 am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '1ac13e0212a770c918d32e6c645682466113632c':
  Support keeping activities resumed while dozing.
 2014-11-21 21:59:47 +00:00
Amith Yamasani
3a3d212a51 Different messages when wiping user and not device 
There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed

Show different messages for almost wipe and wipe in each
of these 3 cases.

Bug: 16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
 2014-11-21 13:57:48 -08:00
Jeff Brown
9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev 
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
 2014-11-21 21:35:08 +00:00
Zoltan Szatmary-Ban
ce2552d980 am 99d983b0: am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev automerge: b3e8ff0 
* commit '99d983b0860272c2edf4e2585995ec064e759b6b':
  Adding method to query backup manager service activity status
 2014-11-21 15:31:44 +00:00
Zoltan Szatmary-Ban
99d983b086 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
automerge: b3e8ff0

* commit 'b3e8ff00c85f37686a45597636d546a5e2a32c26':
  Adding method to query backup manager service activity status
 2014-11-21 15:26:51 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Adrian Roos
f8f56bce42 Fix DPM.resetPassword("") 
While we're at it, also fix some multi-user issues in
LockPatternUtils.

Bug: 17496766
Change-Id: I8e557ea640fa589817c8f8f818c91463585d5ea7
 2014-11-21 13:34:06 +01:00
Filip Gruszczynski
b898936a00 am 5a429758: am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit '5a429758e9df7b49c616105b510eff42bf7bde69':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 12:19:45 +00:00
Christopher Tate
972b140745 am 5b0528b5: am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit '5b0528b5e1374cbb55169d81ab83f866b3e127be':
  Recents backup helper
 2014-11-21 12:18:31 +00:00
Filip Gruszczynski
5a429758e9 am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit '5ea0411f3900064f1d65b93bbe306525398ee4d7':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:26:31 +00:00
Filip Gruszczynski
a83c5806de Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev 
automerge: 96c5d37

* commit '96c5d37fb5139465cdd3d882b5deba830497557a':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:13:59 +00:00
Christopher Tate
5b0528b5e1 am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit 'b2b8dcba2c623f52ebe166ad68bff5f6a34bf25a':
  Recents backup helper
 2014-11-21 03:09:06 +00:00
Adrian Roos
4d4254fdc3 am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d53 
* commit '2a5663d524a29cc33137a6651660506398d0633a':
  Add device locked API for TrustAgentService
 2014-11-21 02:58:07 +00:00
Adrian Roos
05576cc784 am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae5 
* commit 'cf047b5d554b35e504f33994f3a07624c2690633':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:58:00 +00:00
Wink Saville
b638b35757 am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41 
* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:57:27 +00:00
Wink Saville
771e952ebc am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 68c21d6 
* commit '07fb24576a5a425798a2aa004dd49682f414cbf7':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:56:45 +00:00
Adrian Roos
2a5663d524 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
automerge: 62a7d53

* commit '62a7d5334315b4153f1da1112f945d13f72e0381':
  Add device locked API for TrustAgentService
 2014-11-21 02:47:16 +00:00
Adrian Roos
cf047b5d55 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
automerge: 866bae5

* commit '866bae50b7e8f0389b67df54eaf829fa50bc8eaf':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:46:16 +00:00
Adam Lesinski
68976003f0 am 36671b92: am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev automerge: b7ce6d6 
* commit '36671b925c6b5b9e547561c5bacf3419cf71897f':
  Fix race when cleaning up receivers/services in Context
 2014-11-21 02:42:23 +00:00
Wink Saville
49414b5b21 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
automerge: 1caab41

* commit '1caab41f31b2fd1129dff58fc678361b691af9db':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:41:53 +00:00
Wink Saville
07fb24576a am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 68c21d6

* commit '68c21d6736a2ec54d36c8b33b815062c568e4707':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:39:23 +00:00
Adam Lesinski
36671b925c am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 
automerge: b7ce6d6

* commit 'b7ce6d6db1409ec785d2d7146cbcc897fd02d85b':
  Fix race when cleaning up receivers/services in Context
 2014-11-21 02:36:57 +00:00
Christopher Tate
ad064d48ad Merge "Recents backup helper" into lmp-mr1-dev 2014-11-21 02:24:31 +00:00