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

138514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
e44dae77f2 Import translations. DO NOT MERGE 
Change-Id: Iead37ea4585e5baa15f5754b0861be288acc283c
Auto-generated-cl: translation import
 2014-06-09 09:17:35 -07:00
Robin Lee
a54c8246a5 am 0b889cd6: am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId" 
* commit '0b889cd66fdb739a8078fb50212501849e35eb1e':
  Choose CA certificate storage according to userId
 2014-06-09 14:47:04 +00:00
Jessica Hummel
f89fa83374 Merge "Update documentation so it meets api requirements" 2014-06-09 13:55:19 +00:00
George Mount
446956f789 Merge "Capture right/bottom of images properly when doing Activity Transitions." 2014-06-09 13:50:14 +00:00
Nicolas Prevot
e8b8f99dde Merge "Updating documentation for the flags of addCrossProfileIntentFilter" 2014-06-09 13:01:09 +00:00
Robin Lee
0b889cd66f am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId" 
* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
  Choose CA certificate storage according to userId
 2014-06-09 12:55:13 +00:00
Robin Lee
db9e0a674a am 01c07a85: Merge "Choose CA certificate storage according to userId" 
* commit '01c07a856de163dc9a6fd31ea4b42293d221ee63':
  Choose CA certificate storage according to userId
 2014-06-09 12:51:19 +00:00
Jason Monk
1e7bdd7174 Merge "Add an API to clear the device owner." 2014-06-09 12:48:35 +00:00
Robin Lee
01c07a856d Merge "Choose CA certificate storage according to userId" 2014-06-09 12:47:08 +00:00
Robin Lee
3d076afc37 Choose CA certificate storage according to userId 
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.

This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.

Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
 2014-06-09 12:45:17 +00:00
Yohei Yukawa
0fcedfd8ea Merge "Introduce a sequence number to avoid redundant IPCs" 2014-06-09 12:02:30 +00:00
Jessica Hummel
9da603973b Update documentation so it meets api requirements 
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443
 2014-06-09 13:01:03 +01:00
Nicolas Prevot
41d926e3e4 Updating documentation for the flags of addCrossProfileIntentFilter 
Change-Id: I32ed07aecdc8009cbb5708777da5085feabfd4ef
 2014-06-09 11:55:23 +01:00
Calin Juravle
66e29d08c7 am ee20e16d: am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties." 
* commit 'ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d':
  Fixed comments related to profile properties.
 2014-06-09 10:05:04 +00:00
Calin Juravle
ee20e16d7b am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties." 
* commit '337f97bedc09354ea9a8a506aefccc39dd4248e8':
  Fixed comments related to profile properties.
 2014-06-09 09:56:37 +00:00
Yohei Yukawa
3d1e8129eb Introduce a sequence number to avoid redundant IPCs 
This CL introduces a sequence number to avoid redundant IPCs
between IMM and IMMS. The basic concept is that:
1. IMMS maintains a sequence number for #notifyUserAction.
2. IMMS increases the sequence number whenever the current
   IME/subtype is changed.
3. IMMS notifies the new sequence number to IMM.
4. IMM maintains the last sent sequence number and the next
   sequence number. IMM should call #notifyUserAction only
   once per particular sequence number.
5. IMMS ignores #notifyUserAction if the specified sequence
   number is not the expected one.

BUG: 7043015
Change-Id: I19ad8542659bc092b92ee13eb9f1d68ddd4b815a
 2014-06-09 18:30:02 +09:00
Calin Juravle
337f97bedc am 97f7f24c: Merge "Fixed comments related to profile properties." 
* commit '97f7f24c9d9ea35a2e360fb86beb0a9fca4fc2d7':
  Fixed comments related to profile properties.
 2014-06-09 09:23:18 +00:00
Calin Juravle
97f7f24c9d Merge "Fixed comments related to profile properties." 2014-06-09 09:18:23 +00:00
Calin Juravle
de99f08f65 Fixed comments related to profile properties. 
Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
 2014-06-09 10:13:55 +01:00
Robert Greenwalt
cc62d9ad6b Merge "Apply API review to android.net.Network:" 2014-06-08 23:41:27 +00:00
Robert Greenwalt
df2b878ff4 Fix public API of LinkProperties. 
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
 2014-06-08 12:54:23 -07:00
Paul Jensen
6d3ff9ea3a Apply API review to android.net.Network: 
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
 2014-06-08 12:09:18 -07:00
Robert Greenwalt
915c8d5841 Merge "Fix the marking of restricted network requests" 2014-06-08 16:07:40 +00:00
Sailesh Nepal
8b5dd8c5d4 Merge "API: Add call service handoff trigger" 2014-06-07 21:11:17 +00:00
Baligh Uddin
60c78f58ab am 7c12fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '7c12fff112cf0bd09022bf2e87f721fc4c8526f3':
  Import translations. DO NOT MERGE
 2014-06-07 12:33:53 +00:00
Baligh Uddin
2c0b9cf758 am 0b8dd221: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '0b8dd221d213d876438d65d67641001f51cd494d':
  Import translations. DO NOT MERGE
 2014-06-07 12:33:48 +00:00
Baligh Uddin
97892901cd am f7e5788e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit 'f7e5788e8598531998e5934ab700c42d8ba15aa4':
  Import translations. DO NOT MERGE
 2014-06-07 12:33:44 +00:00
Igor Murashkin
09c0d2618c am f6c66902: Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-preview-dev 
* commit 'f6c66902392ae7fcfd44fe90fc43b08b21db2e10':
  util: Make Rational a Number/Comparable; add Range#inRange
 2014-06-07 12:26:23 +00:00
Alan Viverette
bc0fbaebec am 8f04539e: (-s ours) Fix build 
* commit '8f04539ef2c88bdaf9c89bd14b7c23d30ad8ba09':
  Fix build
 2014-06-07 12:26:17 +00:00
Todd Poynor
c42ef37e28 am 1be0bda2: Merge "BatteryManager: battery property query API update" into lmp-preview-dev 
* commit '1be0bda27ef001c41f4d4361f079eb5ca6592b04':
  BatteryManager: battery property query API update
 2014-06-07 10:01:10 +00:00
Nick Kralevich
82b3201a95 resolved conflicts for merge of 13ed83ee to master 
Change-Id: Ia3739cfa7af60e6a47bf94d403df190f3f2cd082
 2014-06-06 21:13:28 -07:00
Baligh Uddin
069f94230d Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:55 +00:00
Baligh Uddin
48798325ed Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:51 +00:00
Baligh Uddin
ceb997bae0 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:45 +00:00
Baligh Uddin
714ac2891c Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:42 +00:00
Baligh Uddin
7892a49615 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:36 +00:00
Baligh Uddin
d29b822d9b Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:29 +00:00
Baligh Uddin
c525c9605f Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:29 +00:00
Baligh Uddin
d5cf4a6ff6 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:23 +00:00
Baligh Uddin
e70fea28e6 Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:20 +00:00
Igor Murashkin
2f98a26bbf Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-preview-dev 2014-06-07 00:35:36 +00:00
Alan Viverette
e6a4613cf3 Fix build 
Change-Id: I49b6330e30710b99f9c89e2a88c95a8157a352ad
 2014-06-06 17:29:11 -07:00
Igor Murashkin
007bfb14d2 util: Make Rational a Number/Comparable; add Range#inRange 
* Also changes Rational to reduce the numerator/denominator by
its greatest common divisor at construction time (e.g. (2/4 -> 1/2)).

Bug: 15432042
Change-Id: Ib827abccf44a040667e5931cf9442afc86b57e2d
 2014-06-06 16:38:09 -07:00
Todd Poynor
407a403402 Merge "BatteryManager: battery property query API update" into lmp-preview-dev 2014-06-06 23:16:16 +00:00
Craig Mautner
3c9f70dc86 Merge "Implement maxRecents and fix TaskPersister bug" into lmp-preview-dev 2014-06-06 23:14:32 +00:00
Alan Viverette
dcdce7730b Merge "Material theme" 2014-06-06 22:49:21 +00:00
Alan Viverette
830960cce0 Material theme 
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
 2014-06-06 15:48:55 -07:00
Tim Murray
08d3775cbe am b43bc047: Merge "Change flags to use int instead of long." into lmp-preview-dev 
* commit 'b43bc0475490fe2a20c2ddeed1c34b55b8f8a152':
  Change flags to use int instead of long.
 2014-06-06 22:41:22 +00:00
Jeff Brown
a18d0acc1f Merge "Rename PrivateApi annotation to SystemApi." 2014-06-06 22:38:54 +00:00
Tim Murray
7fa0e6bc69 Merge "Change flags to use int instead of long." into lmp-preview-dev 2014-06-06 22:36:49 +00:00