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
Paul Jensen
42a5983364 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 
am: 6c35cf2434

* commit '6c35cf2434ca373196b16620455f8f234b63d594':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I9bbca312129011822fc5ea95682bac5ca4258ced
 2016-05-26 14:01:19 +00:00
Ricky Wai
1cb6f9d8a4 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev 2016-05-26 13:46:26 +00:00
Ricky Wai
610fb8a3f2 Merge "Store work lock type even it uses unified lock" into nyc-dev 2016-05-26 13:46:12 +00:00
Paul Jensen
6c35cf2434 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff 
am: bb27626141

* commit 'bb2762614181a0ee03554a96c070ea1006d7263c':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I9e4d3282765dec1554955b9f72484e9d7e2d6594
 2016-05-26 13:44:37 +00:00
Paul Jensen
bb27626141 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff 
am: 8940d2b0ff

* commit '8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I03d6273d7ddaecac071ab3d1207d3d684e80159e
 2016-05-26 13:37:24 +00:00
Paul Jensen
8940d2b0ff Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev 
am: af0b4466ff

* commit 'af0b4466ffe2ed09b288014d1d3a9ed308fe3c76':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I8a49a29ed1999ab811d3306dc46769d83c05244e
 2016-05-26 13:30:59 +00:00
Paul Jensen
af0b4466ff Merge "Don't pass URL path and username/password to PAC scripts" into klp-dev 2016-05-26 13:18:05 +00:00
Clara Bayarri
677b466ad8 Merge "Fix crash in Keyboard Shortcuts Helper logging" 2016-05-26 13:07:30 +00:00
Christopher Tate
0905c8f398 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

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

Change-Id: I3f6a42a6a1c3492439a8a7a93537de52a6f1cf1f
 2016-05-26 12:52:19 +00:00
Christopher Tate
040cf14047 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 
am: 1fa817c057

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

Change-Id: Ia409bff3b5db1ba686d884f81e45b242ec1ae38f
 2016-05-26 12:31:55 +00:00
Nicolas Prévot
57ce118736 Merge "Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821b9 am: eb6ce93432" into nyc-mr1-dev-plus-aosp 
am: 5dc480b24e

* commit '5dc480b24e1df8daa0b5089eaf0523bdc0bd230d':

Change-Id: I1a0e2f92db6d109645a359cdfb484f069261eb2f
 2016-05-26 11:31:21 +00:00
Nicolas Prevot
6857641cb7 Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821b9 am: 37b0156d21 
am: bc9d375b7c

* commit 'bc9d375b7cb8448abdc84e5720fd8140b6ad7e3a':
  Use correct user id when checking uri grants for notification.

Change-Id: I1beccb5a7669ee9623a4e809872fb32e0e356530
 2016-05-26 11:31:11 +00:00
Android Build Merger (Role)
5dc480b24e Merge "Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821b9 am: eb6ce93432" into nyc-mr1-dev-plus-aosp 2016-05-26 11:17:01 +00:00
Nicolas Prévot
b80351de54 Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821b9 
am: eb6ce93432

* commit 'eb6ce934323c487a36426cc62b38a1439b2d12df':
  Use correct user id when checking uri grants for notification.

Change-Id: I9e5ae930570f6a7720d597e8642c8a91ad37e348
 2016-05-26 11:16:33 +00:00
Nicolas Prévot
bc9d375b7c Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821b9 
am: 37b0156d21

* commit '37b0156d21d05f2f00cdbcd0374be73f79f3c900':
  Use correct user id when checking uri grants for notification.

Change-Id: I2e4117c532749ba84df3baa297a26d44f54c2ab4
 2016-05-26 11:16:24 +00:00
Nicolas Prevot
37b0156d21 Merge "Use correct user id when checking uri grants for notification." into nyc-dev 
am: 19d34821b9

* commit '19d34821b9c0a74d4269fff0bee87a7f486e1603':
  Use correct user id when checking uri grants for notification.

Change-Id: I13aff9bc96e465e5a18c8ec44c3c709bc221a8b1
 2016-05-26 11:06:30 +00:00
Nicolas Prevot
eb6ce93432 Merge "Use correct user id when checking uri grants for notification." into nyc-dev 
am: 19d34821b9

* commit '19d34821b9c0a74d4269fff0bee87a7f486e1603':
  Use correct user id when checking uri grants for notification.

Change-Id: Ic5a0e511f7f844e38fba10adb87a059f83673201
 2016-05-26 11:06:30 +00:00
Nicolas Prévot
19d34821b9 Merge "Use correct user id when checking uri grants for notification." into nyc-dev 2016-05-26 10:37:32 +00:00
Clara Bayarri
318ef06316 Fix crash in Keyboard Shortcuts Helper logging 
Bug: 28889634
Change-Id: Ib33ee0bf4d68916e132f0044f4f720db27e7187d
 2016-05-26 11:16:12 +01:00
Yi Kong
7ec7c2b06a Merge "Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am: 03a1314f2e am: 5ede03bfd5" into nyc-mr1-dev-plus-aosp 
am: 57a9c960ca

* commit '57a9c960cac47ec49cbcd8456258e5f2adfd0ab5':

Change-Id: I47948b62ab1869a182c78643fa6d7c505a7f0de1
 2016-05-26 09:30:10 +00:00
Yi Kong
90daac77f2 Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am: 03a1314f2e am: 8ea65f2264 
am: 5e36268510

* commit '5e362685106355d6c67efc63e22d08da408f31c2':
  Docs: Update content license page to include Javadocs licenses

Change-Id: I0609a840c9aec0ca7736d60109fa9da5ed5f6f61
 2016-05-26 09:30:04 +00:00
Android Build Merger (Role)
57a9c960ca Merge "Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am: 03a1314f2e am: 5ede03bfd5" into nyc-mr1-dev-plus-aosp 2016-05-26 09:18:14 +00:00
Yi Kong
5e36268510 Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am: 03a1314f2e 
am: 8ea65f2264

* commit '8ea65f22640576de4bd64ac4abf490bf62e65320':
  Docs: Update content license page to include Javadocs licenses

Change-Id: I848e1e74115ad542c9c6ae4517ac645742d56315
 2016-05-26 09:16:31 +00:00
Yi Kong
7e3031c409 Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am: 03a1314f2e 
am: 5ede03bfd5

* commit '5ede03bfd54875cf7d54706306a801d798c81af0':
  Docs: Update content license page to include Javadocs licenses

Change-Id: I87ba582c31e6c0dced6523fd89cad0e28ec58a9f
 2016-05-26 09:16:25 +00:00
Yi Kong
5ede03bfd5 Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev 
am: 03a1314f2e

* commit '03a1314f2e9040d48488c7cf38dba273ba669284':
  Docs: Update content license page to include Javadocs licenses

Change-Id: Id2217b3e60ac0c5325f2fb1eb3c2fc19445d0577
 2016-05-26 09:09:08 +00:00
Yi Kong
8ea65f2264 Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev 
am: 03a1314f2e

* commit '03a1314f2e9040d48488c7cf38dba273ba669284':
  Docs: Update content license page to include Javadocs licenses

Change-Id: I350ceeb794b065cbc735cda75fff010ee31fd9f4
 2016-05-26 09:09:02 +00:00
Yi Kong
03a1314f2e Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev 2016-05-26 08:54:57 +00:00
Bill Yi
cdc46712af Import translations. DO NOT MERGE 
Change-Id: Iceb3a8f6bffa9f71096eb05e483f2b7913289745
Auto-generated-cl: translation import
 2016-05-26 01:00:46 -07:00
Bill Yi
05930a0c1f Import translations. DO NOT MERGE 
Change-Id: I20074824d92bd827a9f12d13f659d52286be1007
Auto-generated-cl: translation import
 2016-05-26 00:41:49 -07:00
Daichi Hirono
86c1a9bf60 Remove MTP API marked as @removed. 
BUG=28146379

Change-Id: I4f0a380941663eac423f8a5633447f1eceb516cb
 2016-05-26 16:39:21 +09:00
Lajos Molnar
332ea14399 Merge "Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am: 40585321d7 am: 304519b9b9" into nyc-mr1-dev-plus-aosp 
am: 7be968162e

* commit '7be968162ed3fb335d7ecc6be0ec4f50c7c2cf2f':

Change-Id: I843504bbebcc297fe67581709d89757e63f265a3
 2016-05-26 07:01:10 +00:00
Lajos Molnar
1dc65e4d68 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am: 40585321d7 am: e3d6b69562 
am: c2d9a234c1

* commit 'c2d9a234c19922fa06b584db20c40b3a114ad9d0':
  media: check profile, level and bitrate for isFormatSupported

Change-Id: Ic8636c55b21b57f8569f63aaf5e6b64b1b148037
 2016-05-26 06:50:43 +00:00
Bill Yi
706021e05b Import translations. DO NOT MERGE 
Change-Id: I419dd1e73e7f3fdbe491327b3522e9f291f48a6e
Auto-generated-cl: translation import
 2016-05-25 23:43:21 -07:00
Android Build Merger (Role)
7be968162e Merge "Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am: 40585321d7 am: 304519b9b9" into nyc-mr1-dev-plus-aosp 2016-05-26 06:42:02 +00:00
Lajos Molnar
57248e8292 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am: 40585321d7 
am: 304519b9b9

* commit '304519b9b949157827425a5467496a321e79c3a2':
  media: check profile, level and bitrate for isFormatSupported

Change-Id: I69f3066b451ab238caf5421bd12131d3648012ce
 2016-05-26 06:41:27 +00:00
Lajos Molnar
c2d9a234c1 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am: 40585321d7 
am: e3d6b69562

* commit 'e3d6b6956274a2b6036a60f677e1a98c5ec3012e':
  media: check profile, level and bitrate for isFormatSupported

Change-Id: I23379a661cfb1cc6c072ac859b4cc0a1078a5e2f
 2016-05-26 06:41:17 +00:00
Lajos Molnar
e3d6b69562 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev 
am: 40585321d7

* commit '40585321d7b036ce7f609fbf10e8730deb1ad456':
  media: check profile, level and bitrate for isFormatSupported

Change-Id: I86e99d56a5048554fe02f9472f8e81dfe0fbc15a
 2016-05-26 06:27:34 +00:00
Lajos Molnar
304519b9b9 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev 
am: 40585321d7

* commit '40585321d7b036ce7f609fbf10e8730deb1ad456':
  media: check profile, level and bitrate for isFormatSupported

Change-Id: I55d0e328c5da0fb2eef0f0f1ef57a2b59702c972
 2016-05-26 06:27:26 +00:00
Bill Yi
b5f9531a87 Import translations. DO NOT MERGE 
Change-Id: I58f5b21e8001dc878c5dc357a166fd3b25163dcd
Auto-generated-cl: translation import
 2016-05-25 23:17:10 -07:00
Dirk Dougherty
9271b67e9c Merge "Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb am: a283dabdf5 am: 970446d0ac" into nyc-mr1-dev-plus-aosp 
am: 63f3e98377

* commit '63f3e98377c330d088b92a895e75173675ce130b':

Change-Id: I14453a71c822a1e1127651fcde8e98551efacb7c
 2016-05-26 06:16:14 +00:00
Dirk Dougherty
ee463b3847 Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb am: a283dabdf5 am: 74083c0b6b 
am: 89cc659ae0

* commit '89cc659ae024fe26ffe1355495b821a73f36dc12':
  Remove spurious url reference.

Change-Id: Ie2ea50c65e9ef3eecdefd9831b8f789dc2dc018a
 2016-05-26 06:16:07 +00:00
Lajos Molnar
40585321d7 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev 2016-05-26 06:14:04 +00:00
Android Build Merger (Role)
63f3e98377 Merge "Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb am: a283dabdf5 am: 970446d0ac" into nyc-mr1-dev-plus-aosp 2016-05-26 06:07:24 +00:00
Dirk Dougherty
89cc659ae0 Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb am: a283dabdf5 
am: 74083c0b6b

* commit '74083c0b6b1a171a1b8ad0ba7db708fc2f22bef3':
  Remove spurious url reference.

Change-Id: I220eafc9d31dc9fe3e71fb30ea736cf02ae96cc1
 2016-05-26 06:06:49 +00:00
Dirk Dougherty
7d05d1f233 Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb am: a283dabdf5 
am: 970446d0ac

* commit '970446d0acdb6668f1d79ea08534d6c90298c022':
  Remove spurious url reference.

Change-Id: I496a2b01ea84f38276ac4ec09eca92a3e6b968fd
 2016-05-26 06:06:42 +00:00
Bill Yi
4684047177 Import translations. DO NOT MERGE 
Change-Id: I90aeeebe26c2b24d3adbf0931d31011003a05dba
Auto-generated-cl: translation import
 2016-05-25 23:04:43 -07:00
Dirk Dougherty
970446d0ac Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb 
am: a283dabdf5

* commit 'a283dabdf51427dfb5b8be0e6ab86292cb56b72d':
  Remove spurious url reference.

Change-Id: I3d702473090d1fdf9320d359dc0d6feb4eba47c6
 2016-05-26 05:53:48 +00:00
Dirk Dougherty
74083c0b6b Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb 
am: a283dabdf5

* commit 'a283dabdf51427dfb5b8be0e6ab86292cb56b72d':
  Remove spurious url reference.

Change-Id: I9e5ff9472a5434791a4358b92bb40956c2a2e85d
 2016-05-26 05:53:44 +00:00
Dirk Dougherty
a283dabdf5 Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 
am: 1cf99365cb

* commit '1cf99365cb98174bd4300c7f0c799e94f6aab907':
  Remove spurious url reference.

Change-Id: I744e556ebdb729314542dd9115346d42daf63e09
 2016-05-26 05:44:29 +00:00
Chad Brubaker
00f99304e2 Merge "Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 am: 86bceb87ca am: c8f0324f15" into nyc-mr1-dev-plus-aosp 
am: fcbff62ddd

* commit 'fcbff62dddff4c2193632d96b11f915a06e2d9c7':

Change-Id: Id5e26b8391f8d47beb965c0a68b913f864f1a6d4
 2016-05-26 05:44:16 +00:00