drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,281 Commits 1 Branch 0 Tags
Commit Graph

178281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
fe7ceca1ac am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '9ceec2f0f007e05ed2842f222b4f652bdd69eb3f':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:25:48 +00:00
Adrian Roos
9ceec2f0f0 am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'f6c7515817f9a4c24d2ff9baba2f916795862098':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:11:55 +00:00
Adrian Roos
f6c7515817 am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '12c54dfa1219c5bb81482fe4bd4b164637f2e8b2':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 22:59:37 +00:00
Adrian Roos
12c54dfa12 am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 22:49:19 +00:00
Adrian Roos
c9f7abe370 Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev 2015-09-24 22:39:23 +00:00
Paul Jensen
5ebe8e26f2 am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '4cbfe3316fd1105b697a9838ef7bafaebf5080a2':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:33:18 +00:00
Paul Jensen
554cecea4c am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:33:13 +00:00
Paul Jensen
4cbfe3316f am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '773d71e7c45d12810267bb24735360da6e5b258d':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:21:27 +00:00
Paul Jensen
10a7d7449d am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:21:22 +00:00
Paul Jensen
773d71e7c4 am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:13:48 +00:00
Paul Jensen
96cd7c14b5 am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '635f871132449bea7489f6a61276979beeee5591':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:13:40 +00:00
Paul Jensen
962c3a0f2d am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:06:32 +00:00
Paul Jensen
635f871132 am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:06:27 +00:00
Paul Jensen
ece4ac2105 Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev 2015-09-23 10:59:31 +00:00
Paul Jensen
a9e9834314 Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 2015-09-23 10:58:57 +00:00
Zach Jang
3e344f3fcb am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'ba80596bc0d51b3ddf14c1612c341992bc3ac5fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:07:04 +00:00
Zach Jang
0cae838166 am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'b5173241d160a5b6f4d440a01c9a9b0281ee4e66':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:06:58 +00:00
Zach Jang
ba80596bc0 am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'f8cda08986a5caa14daace69e24c82224ac5a9fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 19:10:51 +00:00
Zach Jang
b5173241d1 am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'e54c195a53694696e0913722fa721c882e33753e':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 19:10:46 +00:00
Zach Jang
f8cda08986 am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'b2b3cecbd3de80d40f8c207c6aa94532c3426829':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 18:58:27 +00:00
Zach Jang
e54c195a53 am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 18:58:18 +00:00
Zach Riggle
9836b64f52 am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev 
* commit 'f68b1953259a13562f5a2331526edafae5c1d99f':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-09-17 22:17:11 +00:00
Zach Riggle
f68b195325 am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev 
* commit '683cd049f7c762251567a0e0386ee49bb1428351':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-09-17 22:00:29 +00:00
Zach Riggle
683cd049f7 resolved conflicts for 521def98 to lmp-mr1-dev 2015-09-17 17:34:08 -04:00
Zach Jang
b2b3cecbd3 am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:44:41 +00:00
Zach Jang
7b5bf993e4 am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'fe4cbf2b1b135b327018915a512a8e6293a96017':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:32:53 +00:00
Zach Jang
fe4cbf2b1b am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'cff4e09e26e3b976aa0273df78e89f592fc6d287':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:24:00 +00:00
Zach Jang
cff4e09e26 am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'bdf7f3583c637f370e97e74526df14b9c70e6493':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:09:55 +00:00
Zach Jang
0a8197b1e4 am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '1cf21e443aaf207b962f50169be28c0babe71f61':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:04:23 +00:00
Zach Jang
1cf21e443a DO NOT MERGE - Backport of ag/748165 to klp-dev 
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
 2015-09-17 01:20:27 +00:00
Zach Jang
bdf7f3583c DO NOT MERGE - Backport of ag/748165 to klp-dev 
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
 2015-09-17 01:17:58 +00:00
Zach Jang
63348ae457 am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '11317e82cf561597bbd4e2dbf5840854e6b7a16d':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 01:56:57 +00:00
Zach Jang
1b06455e44 am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '00db0826561b23a54db28ed5203fd7eff79c16c7':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 01:56:52 +00:00
Zach Jang
11317e82cf am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '32a420ea36fbae07484f6fcf718ed97865ca3158':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 01:44:58 +00:00
Zach Jang
00db082656 am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 01:44:53 +00:00
Zach Jang
32a420ea36 Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 2015-09-16 01:40:18 +00:00
Zach Jang
3ee9945be3 Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" 
This reverts commit 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
 2015-09-16 01:38:41 +00:00
Zach Jang
203b43547d Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 2015-09-16 01:37:36 +00:00
Adrian Roos
e70e8ac938 DO NOT MERGE Send next alarm's show intent via PendingIntent 
Bug: 23909438
Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de
 2015-09-15 20:16:58 +00:00
Zach Jang
3b49affdb3 Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s." 
This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
 2015-09-15 20:09:52 +00:00
Michael Wright
521def98c0 am 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog. 
* commit '4c330c6ae53df48f6486b6f047021b204fc66594':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-09-12 06:29:09 +00:00
Android Git Automerger
1c88f60562 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 2015-09-08 21:37:33 +00:00
Cheryl Potter
9e28efe4e7 docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
 2015-09-08 21:36:54 +00:00
Cheryl Potter
e335472def am 4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs 
* commit '4b32b3f43fe8e27ffdb19d51364ebd99a3503e79':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 21:36:35 +00:00
Cheryl Potter
4b32b3f43f Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs 2015-09-08 21:28:06 +00:00
Cheryl Potter
a63d058b0a docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
 2015-09-08 10:49:59 -07:00
Cheryl Potter
4afcda743d am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit '79ad6310ea3ca5931013cf746babf55cf391cc8f':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 22:24:55 +00:00
Renato Mangini
a8b9a2b7ae am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit '81e0dff0da637f3580ac81e86950b23e9a55bbdc':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 22:24:48 +00:00
Cheryl Potter
79ad6310ea Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 2015-09-04 22:14:25 +00:00
Deepanshu Gupta
eb54172719 am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit 'dd21212fa1a9c907d5d2f80f3de2413f6c14da7a':
  LayoutLib: Fix typedArray caching.
 2015-09-01 23:59:10 +00:00