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

141664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
8283f8802d Remove dead code. 
Also adds a TYPE_VPN so the VPN can be strongly typed.

Change-Id: Ibf39450c480f16ce5ab4c25b47965691b844fb92
 2014-07-07 17:09:01 -07:00
Robert Greenwalt
620a5466ce Merge "Remove unused api." 2014-07-02 18:55:10 +00:00
Craig Mautner
0df9858802 am 9d8a30d9: am a7f02a5c: am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists." 
* commit '9d8a30d9e1c17877cd45686a8f6aa70142c33573':
  [ActivityManager] Avoid keeping restarting home when only home activity exists.
 2014-07-07 17:33:32 +00:00
Craig Mautner
9d8a30d9e1 am a7f02a5c: am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists." 
* commit 'a7f02a5cda27147fe7076805187fb6fbc60fdcfb':
  [ActivityManager] Avoid keeping restarting home when only home activity exists.
 2014-07-07 17:26:20 +00:00
Craig Mautner
a7f02a5cda am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists." 
* commit 'ef2e76675a6c60a2a4764a2e19fdb2c4d9beb00e':
  [ActivityManager] Avoid keeping restarting home when only home activity exists.
 2014-07-07 17:23:06 +00:00
Jason Monk
a8f569c10a Add toast when user tries to leave lock-to-app 
The toast will describe how to exit when entered normally, but when
entered by a DPM whitelisted app it will just notify them they are in
the mode.

Bug: 15780115
Change-Id: I75ac8540c31a75ac68e34b3b5c8260e191894b39
 2014-07-07 17:13:34 +00:00
RoboErik
851d2d5d56 Don't send remote volume changes for local playback 
bug: 15913248
Change-Id: I701d0a446ef981deae171b9e882c29906593b3c8
 2014-07-07 16:55:14 +00:00
Quddus Chong
63958c5185 am 56d09070: am af165529: Merge "docs: Fixed url pointing to Google Play Services 5.0 blog post." into klp-modular-dev 
* commit '56d0907024e6389aaa0b84f8f9d82b48ce0b228f':
  docs: Fixed url pointing to Google Play Services 5.0  blog post.
 2014-07-07 16:15:22 +00:00
Quddus Chong
bc50dc6602 am 96a3f04a: am f6438653: Merge "docs: Removed early adopter text from app indexing training doc." into klp-modular-dev 
* commit '96a3f04ac9a6a7a8abc38b58e40371b738120df4':
  docs: Removed early adopter text from app indexing training doc.
 2014-07-07 16:15:17 +00:00
Ricardo Cervera
00f3abf1d2 am 332667a7: am 409b9ed7: Merge "docs: Added release notes and links for sdk/adt 23.0.2" into klp-modular-dev 
* commit '332667a74aad6462995b0bff46074d9e61f5dfeb':
  docs: Added release notes and links for sdk/adt 23.0.2
 2014-07-07 16:15:12 +00:00
Quddus Chong
56d0907024 am af165529: Merge "docs: Fixed url pointing to Google Play Services 5.0 blog post." into klp-modular-dev 
* commit 'af16552983d3d3015b85b73507d5a060d76a67cd':
  docs: Fixed url pointing to Google Play Services 5.0  blog post.
 2014-07-07 16:10:13 +00:00
Quddus Chong
96a3f04ac9 am f6438653: Merge "docs: Removed early adopter text from app indexing training doc." into klp-modular-dev 
* commit 'f6438653e193e5273a76ec910dff929a40871b8e':
  docs: Removed early adopter text from app indexing training doc.
 2014-07-07 16:10:09 +00:00
Ricardo Cervera
332667a74a am 409b9ed7: Merge "docs: Added release notes and links for sdk/adt 23.0.2" into klp-modular-dev 
* commit '409b9ed7b8bee4af2832ccd1c6b76eedf6081a03':
  docs: Added release notes and links for sdk/adt 23.0.2
 2014-07-07 16:10:04 +00:00
Paul Jensen
e585bfe80c When adding a NetworkRequest, cancel linger for satisfying Network. 
This fixes a problem where a requested network can later suddenly disappear if
it was lingering when the request arrived and later the linger timeout expired.

bug:15927234
Change-Id: Ib3fae45820ce4421e3bc5b623937a16d5f1efa0f
 2014-07-07 15:50:24 +00:00
Craig Mautner
b633657be4 am 0a992702: am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again." 
* commit '0a9927025041a6dde3f3878bdd868a69ab1b3266':
  [ActivityManager] Prevent kill a restarted process again.
 2014-07-07 15:47:55 +00:00
Craig Mautner
0a99270250 am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again." 
* commit '09c1af5d5c43f716fb4093eae6cf5442e7bb88d1':
  [ActivityManager] Prevent kill a restarted process again.
 2014-07-07 15:41:55 +00:00
Craig Mautner
09c1af5d5c am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again." 
* commit 'c66da9d606fa3091540bc4c51c2904cc949bf777':
  [ActivityManager] Prevent kill a restarted process again.
 2014-07-07 15:36:33 +00:00
Nick Kralevich
118f04bd9a Fix "Clone" override 
The function should be named "clone", not "Clone".

Also add @Override so that this error can be detected at
compile time.

Change-Id: I976723978a5e3eafbfbc599bac95b8646d18d5ca
 2014-07-07 15:26:28 +00:00
Craig Mautner
53cc7d7998 am 7611a5d3: am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm." 
* commit '7611a5d32889f54b1763cf076a442a0575c69b51':
  [ActivityManager] Ensure alive process is not killedByAm.
 2014-07-07 15:06:41 +00:00
Craig Mautner
7611a5d328 am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm." 
* commit '5acdd0f67db9b5f41a89dfb5200f37d6f5f984ec':
  [ActivityManager] Ensure alive process is not killedByAm.
 2014-07-07 15:00:47 +00:00
Narayan Kamath
10eb3b0665 am e0849423: am 501bb0a5: Merge "Fix issue when converting fil->tl." 
* commit 'e0849423214007d4377638fb42db15276e3ca575':
  Fix issue when converting fil->tl.
 2014-07-07 10:11:23 +00:00
Narayan Kamath
e084942321 am 501bb0a5: Merge "Fix issue when converting fil->tl." 
* commit '501bb0a5e4a62a9e58efe2fa0a3f275c193872e7':
  Fix issue when converting fil->tl.
 2014-07-07 08:57:04 +00:00
Robert Ly
048d1076ae am 8f0f930d: Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev 
* commit '8f0f930d3bf8d74c4680cc94a8def9e3db0989b8':
  Fix incorrect link in Android Wear documentation.
 2014-07-06 22:31:00 +00:00
Baligh Uddin
b33e23ead7 am abef99cf: (-s ours) am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'abef99cf6a18873ff2079285d26755b41aed979b':
  Import translations. DO NOT MERGE
 2014-07-06 19:49:37 +00:00
Baligh Uddin
660630f242 am 11281de7: (-s ours) am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '11281de7a2c335ed5410fa83b275173130714f52':
  Import translations. DO NOT MERGE
 2014-07-06 19:49:33 +00:00
Baligh Uddin
abef99cf6a am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '02c355d10b3235b73d58ab54222721e32bec3f1f':
  Import translations. DO NOT MERGE
 2014-07-06 19:45:38 +00:00
Baligh Uddin
11281de7a2 am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '89523569e4c1be2e102b5fb991023d6696384d76':
  Import translations. DO NOT MERGE
 2014-07-06 19:45:34 +00:00
Baligh Uddin
02c355d10b am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '59db17673d9d2a5be386e9f324f8f2a7b455d0b1':
  Import translations. DO NOT MERGE
 2014-07-06 19:42:25 +00:00
Baligh Uddin
89523569e4 am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '314bfe071011cc16d56a9c8bfb65000cd3597bf0':
  Import translations. DO NOT MERGE
 2014-07-06 19:42:22 +00:00
Baligh Uddin
5ac6a47f25 am de9bfb79: (-s ours) am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'de9bfb799e99440888ecd911d60f42ff206c886c':
  Import translations. DO NOT MERGE
 2014-07-06 18:44:06 +00:00
Baligh Uddin
36524e0cbd am 9c9223d9: (-s ours) am 2ea222e6: (-s ours) am 93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '9c9223d91eb57ba7f45532e551861696c55883ec':
  Import translations. DO NOT MERGE
 2014-07-06 18:44:02 +00:00
Baligh Uddin
1b0960dec7 am 494d4005: (-s ours) am ab157d74: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '494d4005d5bb1e23fceefa766dca95c3acfa610f':
  Import translations. DO NOT MERGE
 2014-07-06 18:40:04 +00:00
Baligh Uddin
7b3e377c4d am 861beac4: (-s ours) am 87bcd150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '861beac4f3c04850a8f99fca0bafb002a5ddecdf':
  Import translations. DO NOT MERGE
 2014-07-06 18:40:00 +00:00
Baligh Uddin
1c42269cb3 am 476a40e3: (-s ours) am f643d529: (-s ours) am b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '476a40e33243c7c86859aa7fbadb8f24c0c32d3b':
  Import translations. DO NOT MERGE
 2014-07-06 18:39:57 +00:00
Baligh Uddin
1131029184 am 2353a8fc: (-s ours) am 2f689434: (-s ours) am f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2353a8fc5da7402e7bdd0b6eb54edb583fe27f8f':
  Import translations. DO NOT MERGE
 2014-07-06 18:39:53 +00:00
Baligh Uddin
777dafeda8 am 5195064e: (-s ours) am 6e90b3c0: (-s ours) am f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5195064e8280c85fbda996df58e247e8a8509d1f':
  Import translations. DO NOT MERGE
 2014-07-06 18:39:49 +00:00
Baligh Uddin
de9bfb799e am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8e1bf9f1a38b70459ddcaeb816b83c3c83e8c9b8':
  Import translations. DO NOT MERGE
 2014-07-06 18:39:28 +00:00
Baligh Uddin
9c9223d91e am 2ea222e6: (-s ours) am 93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2ea222e6615cef6977e40b0dbb7b58c2313e6976':
  Import translations. DO NOT MERGE
 2014-07-06 18:39:24 +00:00
Baligh Uddin
e532e686cb am 03c248aa: (-s ours) am 51ad6520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '03c248aadece8459d2568dd8721d46cf748c7a56':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:33 +00:00
Baligh Uddin
52b7c688ff am b140440e: (-s ours) am 6b7d2cf7: (-s ours) am f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b140440ea33ce512ba372deb11171ac688b1200b':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:29 +00:00
Baligh Uddin
301c1f5d18 am 75a54319: (-s ours) am 6df13287: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '75a543193546525908c94981721a5d19f31fe285':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:26 +00:00
Baligh Uddin
4e899ae24b am 3b7b9f95: (-s ours) am 334c84cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '3b7b9f95a920e9b97067bc8004bd96156bcd8f7e':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:22 +00:00
Baligh Uddin
494d4005d5 am ab157d74: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'ab157d740ed5c0bff544adc8992d9fce99462707':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:21 +00:00
Baligh Uddin
861beac4f3 am 87bcd150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '87bcd150a4122b78e98d3b859869b54e4546405d':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:17 +00:00
Baligh Uddin
476a40e332 am f643d529: (-s ours) am b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f643d52941be004e14b7edfe3035996475f95028':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:12 +00:00
Baligh Uddin
2353a8fc5d am 2f689434: (-s ours) am f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2f6894345691af96d23952146bc3495758f84fbb':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:08 +00:00
Baligh Uddin
8e1bf9f1a3 am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '43ba3ba479e3779db4f260eae55ddbfbf3dc30d8':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:07 +00:00
Baligh Uddin
5195064e82 am 6e90b3c0: (-s ours) am f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '6e90b3c078baa2b6c6398376490b7c540309be70':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:04 +00:00
Baligh Uddin
2ea222e661 am 93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '93360f022ec67bb994f04f9799bfac32997f0d00':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:04 +00:00
Baligh Uddin
ee7333b2c1 am b14aee38: (-s ours) am add3fb66: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'b14aee38b65d1896f51a31c428c1eb387709597a':
  Import translations. DO NOT MERGE
 2014-07-06 18:29:18 +00:00